updating to include additional mappings