Migrating towards better key handling