Update key handling