Added actions and key overrides