Martin's ontology update