Separate command mappings from keymappings