Amending key handlers