ontology server refactoring