Some further work on the keymap