Move mappings into the plugin