Refactored buildout to embed new ontology parser