Changed and added some mappings