Some model changes + use of RoleType + new Ontology services