Added new mappings
Updated