Updated some mappings