Additional ODM mapping adjustments