Changed some mappings