Updates to ontology - work still in progress