Small additions to keymap