Simplify key handling