Adjustements for ODM support