Updated to new mappings