diff --git a/ontology/saref4ehaw.ttl b/ontology/saref4ehaw.ttl
index df76803780012a317d55c2984df2008d970f356b..34e0026f98de4b91821ab6c5c6678b78f896113b 100644
--- a/ontology/saref4ehaw.ttl
+++ b/ontology/saref4ehaw.ttl
@@ -15,8 +15,6 @@
 
 <https://saref.etsi.org/saref4ehaw/> rdf:type owl:Ontology ;
                                  
-                                 rdfs:label "SAREF4EHAW"@en ;
-                                 
                                  dcterms:description """The objective of SAREF4EHAW is to extend SAREF ontology for the eHealth/Ageing-well (EHAW) vertical. Clause 4.1 of the present document shortly introduces a high level view of the envisioned SAREF4EHAW semantic model and modular ontology, with the retained concepts (i.e. classes) and their relations. 
 SAREF4EHAW extension has been specified and formalised by investigating EHAW domain related resources, as reported in ETSI TR 103 509, such as: potential stakeholders, standardization initiatives, alliances/associations, European projects, EC directives, existing ontologies, and data repositories. Therefore, SAREF4EHAW modular ontology shall both:
  - Allow the implementation of a limited set of typical EHAW related use cases already identified in ETSI TR 103 509, i.e.
@@ -34,8 +32,6 @@ For embedded semantic analytics purposes, SAREF4EHAW shall behas been designed u
                                  
                                  dcterms:modified "do not set this"^^xsd:date ;
                                  
-                                 dcterms:created "2019-01-01"^^xsd:date ;
-                                 
                                  dcterms:title "SAREF4EHAW: an extension of SAREF for eHealth Ageing Well domain"@en ;
                                  
                                  owl:versionInfo "v1.1.1" ;
@@ -54,182 +50,17 @@ For embedded semantic analytics purposes, SAREF4EHAW shall behas been designed u
                                  
                                  dcterms:license <https://forge.etsi.org/etsi-software-license> ;
                                  
-                                 dcterms:source <https://forge.etsi.org/rep/SAREF/s4ehaw/> ;
+                                 dcterms:source <https://forge.etsi.org/rep/SAREF/saref4ehaw/> ;
 
                                  rdfs:seeAlso <https://www.etsi.org/deliver/etsi_tr/103500_103599/103509/01.01.01_60/tr_103509v010101p.pdf> ;
                                  
-                                 owl:imports <https://saref.etsi.org/saref/latest/saref.ttl> ;
+                                 owl:imports <https://saref.etsi.org/core/v3.1.1/> ;
                                  
                                  dcterms:publisher <https://www.etsi.org/> .
 
 
 
 
-#################################################################
-#
-#    Annotation properties
-#
-#################################################################
-
-
-###  http://purl.org/dc/terms/contributor
-
-dcterms:contributor rdf:type owl:AnnotationProperty .
-
-
-
-###  http://purl.org/dc/terms/created
-
-dcterms:created rdf:type owl:AnnotationProperty .
-
-
-
-###  http://purl.org/dc/terms/creator
-
-dcterms:creator rdf:type owl:AnnotationProperty .
-
-
-
-###  http://purl.org/dc/terms/description
-
-dcterms:description rdf:type owl:AnnotationProperty .
-
-
-
-###  http://purl.org/dc/terms/issued
-
-dcterms:issued rdf:type owl:AnnotationProperty .
-
-
-
-###  http://purl.org/dc/terms/license
-
-dcterms:license rdf:type owl:AnnotationProperty .
-
-
-
-###  http://purl.org/dc/terms/modified
-
-dcterms:modified rdf:type owl:AnnotationProperty .
-
-
-
-###  http://purl.org/dc/terms/publisher
-
-dcterms:publisher rdf:type owl:AnnotationProperty .
-
-
-
-###  http://purl.org/dc/terms/source
-
-dcterms:source rdf:type owl:AnnotationProperty .
-
-
-
-###  http://purl.org/dc/terms/title
-
-dcterms:title rdf:type owl:AnnotationProperty .
-
-
-
-###  http://purl.org/vocab/vann/preferredNamespacePrefix
-
-vann:preferredNamespacePrefix rdf:type owl:AnnotationProperty .
-
-
-
-###  http://purl.org/vocab/vann/preferredNamespaceUri
-
-vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
-
-
-
-###  http://www.w3.org/1999/02/22-rdf-syntax-ns#comment
-
-rdf:comment rdf:type owl:AnnotationProperty .
-
-
-
-###  https://saref.etsi.org/s4ehaw/isDescribedBy
-
-s4ehaw:isDescribedBy rdf:type owl:AnnotationProperty ;
-                     
-                     rdfs:label "is described by"@en ;
-                     
-                     rdfs:comment "A service is described by a service process (how the service works)."@en ;
-                     
-                     rdfs:domain saref:Service .
-
-
-
-###  https://saref.etsi.org/s4ehaw/presents
-
-s4ehaw:presents rdf:type owl:AnnotationProperty ;
-                
-                rdfs:label "presents"@en ;
-                
-                rdfs:comment "A service presents a service profile (what the service does)."@en ;
-                
-                rdfs:domain saref:Service .
-
-
-
-###  https://saref.etsi.org/s4ehaw/supports
-
-s4ehaw:supports rdf:type owl:AnnotationProperty ;
-                
-                rdfs:label "supports"@en ;
-                
-                rdfs:comment "A service supports a service grounding (how to access the service)." ;
-                
-                rdfs:domain saref:Service .
-
-
-
-###  https://saref.etsi.org/saref/core/accomplishes
-
-saref:accomplishes rdf:type owl:AnnotationProperty .
-
-
-
-###  https://saref.etsi.org/saref/core/consistsOf
-
-saref:consistsOf rdf:type owl:AnnotationProperty .
-
-
-
-###  https://saref.etsi.org/saref/core/hasTimestamp
-
-saref:hasTimestamp rdf:type owl:AnnotationProperty .
-
-
-
-###  https://saref.etsi.org/saref/core/hasValue
-
-saref:hasValue rdf:type owl:AnnotationProperty .
-
-
-
-###  https://saref.etsi.org/saref/core/isMeasuredIn
-
-saref:isMeasuredIn rdf:type owl:AnnotationProperty .
-
-
-
-###  https://saref.etsi.org/saref/core/makesMeasurement
-
-saref:makesMeasurement rdf:type owl:AnnotationProperty .
-
-
-
-###  https://saref.etsi.org/saref/core/relatesToProperty
-
-saref:relatesToProperty rdf:type owl:AnnotationProperty .
-
-
-
-
-
 #################################################################
 #
 #    Object Properties