Moved navigation mappings to a separate plugin