Add ODM services
Adjust interfaces during teh ODM test