better keymap support