diff --git a/.saref-repositories.yml b/.saref-repositories.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3366e13f0ac2f40a9ef69af1fcfec6019bbbb5aa
--- /dev/null
+++ b/.saref-repositories.yml
@@ -0,0 +1,5 @@
+forge.etsi.org/rep/:
+  repos:
+    - saref/saref-core
+    - saref/saref4ener
+    - saref/saref4envi
diff --git a/ontology/saref4ehaw.ttl b/ontology/saref4ehaw.ttl
index fe6854d0be97f8984279eeaf57573aacc2739ac2..ced125c37d3c4ecf0ee62728abb81da1a1ddfab7 100644
--- a/ontology/saref4ehaw.ttl
+++ b/ontology/saref4ehaw.ttl
@@ -5,7 +5,7 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix vann: <http://purl.org/vocab/vann/> .
 @prefix voaf: <http://purl.org/vocommons/voaf#> .
-@prefix saref: <https://saref.etsi.org/saref/core/> .
+@prefix saref: <https://saref.etsi.org/core/> .
 @prefix s4ehaw: <https://saref.etsi.org/saref4ehaw/> .
 @prefix s4envi: <https://saref.etsi.org/saref4envi/> .
 @prefix ssn-system: <http://www.w3.org/ns/ssn/systems/> .
@@ -13,7 +13,7 @@
 @base <https://saref.etsi.org/saref4ehaw/> .
 
 <https://saref.etsi.org/saref4ehaw/> rdf:type owl:Ontology ;
-                                      owl:imports <https://saref.etsi.org/core/> ;
+                                      owl:imports <https://saref.etsi.org/core/v3.1.1/> ;
 				      dcterms:creator <http://www-public.imtbs-tsp.eu/~girodgen/> ;
                                       dcterms:contributor <https://www.linkedin.com/in/lina-nachabe-2b292457/> ,
 						          <https://research.utwente.nl/en/persons/jo%C3%A3o-luiz-moreira> ,
@@ -22,7 +22,8 @@
 				      dcterms:publisher <https://www.etsi.org/> ;
 				      dcterms:license <https://forge.etsi.org/etsi-software-license> ;
                                       dcterms:source <https://forge.etsi.org/rep/SAREF/saref4ehaw/> ;
-                                      owl:versionInfo "1.0" ;
+                                      owl:versionIRI <https://saref.etsi.org/saref4ehaw/v1.1.1/> ;
+                                      owl:versionInfo "v1.1.1" ;
                                       vann:preferredNamespacePrefix "s4ehaw" ;
                                       vann:preferredNamespaceUri "https://saref.etsi.org/saref4ehaw/" ;
                                       dcterms:issued "2020-02-01"^^xsd:date ;
@@ -39,12 +40,15 @@ SAREF4EHAW extension has been specified and formalised by investigating EHAW dom
 SAREF4EHAW mainly reuses the following existing ontologies: SAREF, ETSI SmartBAN reference model, SAREF 4 Environment extension and W3C SSN System module. The following figure presents the high level view of SAREF4EHAW ontology.
 ![SAREF4SYST overview](diagrams/SAREF4EHAW_Model.jpg)
 For semantic interoperability handling purposes, an ontology based solution, combined with sensing-as-a-service and WoT strategies, is retained for SAREF4EHAW. Therefore, an upper level ontology, at service level, shall also behas been fully modelled (Service class and sub-classes depicted in the previous figure).
-For embedded semantic analytics purposes, SAREF4EHAW shall behas been designed using the modularity principle (see ETSI TR 103 509) and can thus be mainly described by the following self-contained knowledge sub-ontologies (or modules): HealthActor, Ban, HealthDevice, Function (measured data related concepts included) and Service."""^^<http://www.iana.org/assignments/media-types/text/markdown> .
+For embedded semantic analytics purposes, SAREF4EHAW shall behas been designed using the modularity principle (see ETSI TR 103 509) and can thus be mainly described by the following self-contained knowledge sub-ontologies (or modules): HealthActor, Ban, HealthDevice, Function (measured data related concepts included) and Service."""^^<https://www.iana.org/assignments/media-types/text/markdown> .
 
 #################################################################
 #    Annotation properties
 #################################################################
 
+xsd:duration a owl:Datatype .
+
+
 ###  http://purl.org/dc/terms/contributor
 dcterms:contributor rdf:type owl:AnnotationProperty .
 
@@ -394,7 +398,7 @@ s4ehaw:hasChronicDisease rdf:type owl:ObjectProperty ;
                    rdfs:domain s4ehaw:Patient ;
                    rdfs:range s4ehaw:ChronicDisease ;
                    rdfs:comment "A patient can suffer from one or more chronic disease like Diabetes, azma, etc."@en ;
-                   rdfs:label "has chronic disease" .
+                   rdfs:label "has chronic disease"@en .
 
 
 ###  https://saref.etsi.org/saref4envi/hasFrequencyMeasurement
@@ -901,7 +905,7 @@ s4ehaw:BanApplicationDomain rdf:type owl:Class ;
 s4ehaw:BanHub rdf:type owl:Class ;
               rdfs:subClassOf s4ehaw:HealthDevice ;
               rdfs:comment "Hub of the BAN, mainly playing the role of both a data concentrator and a network gateway."@en ;
-              rdfs:label "BAN hub" .
+              rdfs:label "BAN hub"@en .
 
 
 ###  https://saref.etsi.org/saref4ehaw/BodySurfaceLocation
@@ -993,7 +997,7 @@ s4ehaw:FunctionalDevice rdf:type owl:Class ;
 ###  https://saref.etsi.org/saref4ehaw/Habit
 s4ehaw:Habit rdf:type owl:Class ;
              rdfs:comment "Defined for users (that can in particular be patients) habits modelling, e.g. smoking, alcohol drinking, overeating, undereating..."@en ;
-             rdfs:label "Habit" .
+             rdfs:label "Habit"@en .
 
 
 ###  https://saref.etsi.org/saref4ehaw/HealthActor
@@ -1027,7 +1031,7 @@ s4ehaw:HealthSensor rdf:type owl:Class ;
 ###  https://saref.etsi.org/saref4ehaw/HealthWearable
 s4ehaw:HealthWearable rdf:type owl:Class ;
                       rdfs:subClassOf s4ehaw:HealthDevice ;
-		      rdfs:comment  "Health-related Wearable, equivalent to SAREF4WEAR Wearable." @en ;
+		      rdfs:comment  "Health-related Wearable, equivalent to SAREF4WEAR Wearable."@en ;
                       rdfs:label "Health wereable"@en .
 
 
@@ -1041,7 +1045,7 @@ s4ehaw:Helper rdf:type owl:Class ;
 ###  https://saref.etsi.org/saref4ehaw/Impairment
 s4ehaw:Impairment rdf:type owl:Class ;
                   rdfs:comment "Defined for users (that can in particular be patients) impairments modelling, e.g. aural impairment, skeletal impairment, ocular impairment, mobility impairment, intellectual impairment. Those non exhaustive impairments are compatible with the World Health Organization classification."@en ;
-                  rdfs:label "Impairment" .
+                  rdfs:label "Impairment"@en .
 
 
 ###  https://saref.etsi.org/saref4ehaw/ImplantLocation
@@ -1187,8 +1191,8 @@ s4ehaw:TimeSeriesMeasurement rdf:type owl:Class ;
                                                 owl:onProperty s4ehaw:hasValues ;
                                                 owl:allValuesFrom xsd:decimal
                                               ] ;
-                              rdfs:comment "A sequence of data in a successive equally spaced points in time. The O&M ontology (ISO 19156) defines Time Series Observation  as an “observation whose result is a time-series”, while both Hl7 aECG and DICOM standards define the Series element as a sequence of data sharing a common frame of reference. In SAREF4health this concept is termed as Time Series Measurements since this sequence of data refers to time series measured by a health device." ;
-                              rdfs:label "Time series measurement" .
+                              rdfs:comment "A sequence of data in a successive equally spaced points in time. The O&M ontology (ISO 19156) defines Time Series Observation  as an “observation whose result is a time-series”, while both Hl7 aECG and DICOM standards define the Series element as a sequence of data sharing a common frame of reference. In SAREF4health this concept is termed as Time Series Measurements since this sequence of data refers to time series measured by a health device."@en ;
+                              rdfs:label "Time series measurement"@en .
 
 
 ###  https://saref.etsi.org/saref4ehaw/User
diff --git a/tests/tests.csv b/tests/tests.csv
new file mode 100644
index 0000000000000000000000000000000000000000..e5dcc77698883c17e1c0c7e2e5e64420b7af82c4
--- /dev/null
+++ b/tests/tests.csv
@@ -0,0 +1 @@
+Id;Requirement;Category;Test