Add various mappings
Update all submodules