changes to how keys are created and handled