Added classes to make the ontology closer to what's developed in dm2e-ws