More work on the new ontology and data model.