Switching from Id to Keys