Updated to add other keymaps