More ontology updates

Two new terms and one more structural change