update to follow latest ontology