Update ontology and thus data models to the final 0.6 models