Adjusted ODM mappings