OntologyProvider refactoring