Support for OEM/ODM services