Keymaps refactoring