More mappings updates