Rework how keys are defined