Cosmetic updates to the mappings order
Updated submodules to the latest version