Added OntologyStore and updated indenting