Added new mappings and models