Using recent OMS refactoring allowing us to simplify access to ONC