diff --git a/ontology/saref4ehaw.ttl b/ontology/saref4ehaw.ttl
index 5fe69b64776aab79cbbb7eb89f0942bd1f1c2a1e..6780f01ad15386b1646ab306d11baaddce522290 100644
--- a/ontology/saref4ehaw.ttl
+++ b/ontology/saref4ehaw.ttl
@@ -7,7 +7,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/saref/core/> .
 @prefix s4ehaw: <https://saref.etsi.org/s4ehaw/> .
 @prefix s4envi: <https://saref.etsi.org/saref4envi/> .
 @prefix s4wear: <https://saref.etsi.org/s4wear/> .
@@ -152,6 +152,86 @@ 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
@@ -368,6 +448,7 @@ s4ehaw:hasMode rdf:type owl:ObjectProperty ;
                rdfs:range s4ehaw:Mode .
 
 
+
 ###  https://saref.etsi.org/s4ehaw/hasOperatingConstraint
 
 s4ehaw:hasOperatingConstraint rdf:type owl:ObjectProperty ;
@@ -514,9 +595,7 @@ s4ehaw:isDescribedBy rdf:type owl:ObjectProperty ;
                      
                      rdfs:comment "A service is described by a service process (how the service works)."@en ;
                      
-                     rdfs:range s4ehaw:ServiceProcess ;
-                     
-                     rdfs:domain saref:Service .
+                     rdfs:range s4ehaw:ServiceProcess .
 
 
 
@@ -528,9 +607,7 @@ s4ehaw:presents rdf:type owl:ObjectProperty ;
                 
                 rdfs:comment "A service presents a service profile (what the service does)."@en ;
                 
-                rdfs:range s4ehaw:ServiceProfile ;
-                
-                rdfs:domain saref:Service .
+                rdfs:range s4ehaw:ServiceProfile .
 
 
 
@@ -542,9 +619,7 @@ s4ehaw:supports rdf:type owl:ObjectProperty ;
                 
                 rdfs:comment "A service supports a service grounding (how to access the service)." ;
                 
-                rdfs:range s4ehaw:ServiceGrounding ;
-                
-                rdfs:domain saref:Service .
+                rdfs:range s4ehaw:ServiceGrounding .
 
 
 
@@ -579,55 +654,15 @@ s4ehaw:usesBan rdf:type owl:ObjectProperty ;
 ###  https://saref.etsi.org/saref4envi/hasFrequencyMeasurement
 
 s4envi:hasFrequencyMeasurement rdf:type owl:ObjectProperty ;
-
+                               
                                rdfs:label "has frequency measurement"@en ;
-
+                               
                                rdfs:comment "A measurement fucntion, in case of complex measurement like time series, has frequency measurement, i.e. the frequency in which it makes measurements."@en ;
+                               
+                               rdfs:domain s4ehaw:MeasurementFunction ;
+                               
+                               rdfs:range s4envi:FrequencyMeasurement .
 
-                               rdfs:range s4envi:FrequencyMeasurement ;
-
-                               rdfs:domain s4ehaw:MeasurementFunction .
-
-
-### https://saref.etsi.org/saref/core/hasCommand
-
-### saref:hasCommand rdf:type owl:ObjectProperty ;
-### 
-###                  rdfs:label "has command"@en ;
-### 
-###                  rdfs:comment "A function has a command (a directive that a device must support to perform a given function)."@en ;
-### 
-###                  rdfs:range saref:Command ;
-### 
-###                  rdfs:domain saref:Function .
-
-
-
-### https://saref.etsi.org/saref/core/hasFunction
-
-### saref:hasFunction rdf:type owl:ObjectProperty ;
-
-###                   rdfs:label "has function"@en ;
-
-###                   rdfs:comment "A device has a function (e.g., for an ehealth device, temperature measurement, blood pressure measurement, insulin regulation)."@en ;
-
-###                   rdfs:range saref:Function ;
-
-###                   rdfs:domain saref:Device .
-
-
-
-###  https://saref.etsi.org/saref/core/offers
-
-###  saref:offers rdf:type owl:ObjectProperty ;
-
-###               rdfs:label "offers"@en ;
-
-###               rdfs:comment "A device offers services, e.g., for an eHealth device, a thermometer offers a temperature measurement service."@en ;
-
-###               rdfs:range saref:Service ;
-
-###               rdfs:domain saref:Device .
 
 
 
@@ -638,6 +673,7 @@ s4envi:hasFrequencyMeasurement rdf:type owl:ObjectProperty ;
 #
 #################################################################
 
+
 ###  https://saref.etsi.org/s4ehaw/activityDuration
 
 s4ehaw:activityDuration rdf:type owl:DatatypeProperty ;
@@ -1477,6 +1513,7 @@ s4ehaw:velocity rdf:type owl:DatatypeProperty ;
 
 
 
+
 #################################################################
 #
 #    Classes
@@ -1501,10 +1538,10 @@ foaf:Agent rdf:type owl:Class ;
 ###  https://saref.etsi.org/s4ehaw/Activity
 
 s4ehaw:Activity rdf:type owl:Class ;
-
-                rdfs:comment "The activity of a patient/user, i.e. daily and nocturnal activities."@en ;
-
-                rdfs:label "Activity"@en .
+                
+                rdfs:label "Activity"@en ;
+                
+                rdfs:comment "The activity of a patient/user, i.e. daily and nocturnal activities."@en .
 
 
 
@@ -1512,29 +1549,41 @@ s4ehaw:Activity rdf:type owl:Class ;
 
 s4ehaw:AlarmCommand rdf:type owl:Class ;
                     
-                    rdfs:subClassOf saref:Command ;
-
-                    rdfs:label "Alarm comand"@en .
+                    rdfs:label "Alarm comand"@en ;
+                    
+                    rdfs:subClassOf saref:Command .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/Ban
 
 s4ehaw:Ban rdf:type owl:Class ;
-
-           rdfs:comment "Smart Body Area Network (BAN), as defined within ETSI SmartBAN TC (see ETSI TR 103 394)."@en ;
-
-           rdfs:label "BAN"@en .
+           
+           rdfs:label "BAN"@en ;
+           
+           rdfs:comment "Smart Body Area Network (BAN), as defined within ETSI SmartBAN TC (see ETSI TR 103 394)."@en .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/BanApplicationDomain
 
 s4ehaw:BanApplicationDomain rdf:type owl:Class ;
+                            
+                            rdfs:label "BAN application domain"@en ;
+                            
+                            rdfs:comment "The BAN application domain, e.g. healthcare, telemedicine, assisted living, sport training, safety and emergency..."@en .
 
-                            rdfs:comment "The BAN application domain, e.g. healthcare, telemedicine, assisted living, sport training, safety and emergency..."@en ;
 
-                            rdfs:label "BAN application domain"@en .
+
+###  https://saref.etsi.org/s4ehaw/BanHub
+
+s4ehaw:BanHub rdf:type owl:Class ;
+              
+              rdfs:label "BAN hub" ;
+              
+              rdfs:subClassOf s4ehaw:HealthDevice ;
+              
+              rdfs:comment "Hub of the BAN, mainly playing the role of both a data concentrator and a network GW."@en .
 
 
 
@@ -1542,11 +1591,11 @@ s4ehaw:BanApplicationDomain rdf:type owl:Class ;
 
 s4ehaw:BodySurfaceLocation rdf:type owl:Class ;
                            
+                           rdfs:label "Body surface location"@en ;
+                           
                            rdfs:subClassOf s4ehaw:Location ;
-
-                           rdfs:comment "Defines a helth device location in terms of a body surface position (i.e. on body health device)."@en ;
-
-                           rdfs:label "Body surface location"@en .
+                           
+                           rdfs:comment "Defines a helth device location in terms of a body surface position (i.e. on body health device)."@en .
 
 
 
@@ -1554,64 +1603,41 @@ s4ehaw:BodySurfaceLocation rdf:type owl:Class ;
 
 s4ehaw:Caregiver rdf:type owl:Class ;
                  
+                 rdfs:label "Caregiver"@en ;
+                 
                  rdfs:subClassOf s4ehaw:HealthActor ;
-
-                 rdfs:comment "For caregivers modelling."@en ;
-
-                 rdfs:label "Caregiver"@en .
-
-
-###  https://saref.etsi.org/core/Command
-
-### saref:Command rdf:type owl:Class ;
-
-###               rdfs:comment "A directive that a device must support to perform a certain function. A command may act upon a state, but does not necessarily act upon a state. For example, the ON command acts upon the ON/OFF state, but the GET command does not act upon any state, it simply gives a directive to retrieve a certain value. We propose here a list of commands that are relevant for the purpose of SAREF, but this list can be extended."@en ;
-
-###               rdfs:isDefinedBy saref: ;
-
-###               rdfs:label "Command"@en .
-
-
-
-###  https://saref.etsi.org/core/NotifyCommand
-
-### saref:NotifyCommand rdf:type owl:Class ;
-
-###                     rdfs:comment "A type of command used for notifications."@en ;
-	     
-###                     rdfs:isDefinedBy saref: ;
-	     
-###                     rdfs:label "Notify command"@en .
+                 
+                 rdfs:comment "For caregivers modelling."@en .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/CommunicationFunction
 
 s4ehaw:CommunicationFunction rdf:type owl:Class ;
-
-                             rdfs:comment "The BAN communication function way of working, i.e. periodic, event driven or on request."@en ;
-
-                             rdfs:label "Communication function"@en .
+                             
+                             rdfs:label "Communication function"@en ;
+                             
+                             rdfs:comment "The BAN communication function way of working, i.e. periodic, event driven or on request."@en .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/ComputingPower
 
 s4ehaw:ComputingPower rdf:type owl:Class ;
-
-                      rdfs:comment "The computing power capabilities of a Health device."@en ;
-
-                      rdfs:label "Computing power"@en .
+                      
+                      rdfs:label "Computing power"@en ;
+                      
+                      rdfs:comment "The computing power capabilities of a Health device."@en .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/Constraint
 
 s4ehaw:Constraint rdf:type owl:Class ;
-
-                  rdfs:comment "The Data constraints, e.g. validity, operating, security..."@en ;
-
-                  rdfs:label "Constraint"@en .
+                  
+                  rdfs:label "Constraint"@en ;
+                  
+                  rdfs:comment "The Data constraints, e.g. validity, operating, security..."@en .
 
 
 
@@ -1619,11 +1645,11 @@ s4ehaw:Constraint rdf:type owl:Class ;
 
 s4ehaw:Contact rdf:type owl:Class ;
                
+               rdfs:label "Contact"@en ;
+               
                owl:equivalentClass s4ehaw:HealthActor ;
-
-               rdfs:comment  "A BAN has one or multiple contacts, i.e some health actors, e.g. the patient or user that is monitored through this BAN, the caregiver that is using this BAN for monitoring purposes..."@en ;
-
-               rdfs:label "Contact"@en .
+               
+               rdfs:comment "A BAN has one or multiple contacts, i.e some health actors, e.g. the patient or user that is monitored through this BAN, the caregiver that is using this BAN for monitoring purposes..."@en .
 
 
 
@@ -1631,43 +1657,31 @@ s4ehaw:Contact rdf:type owl:Class ;
 
 s4ehaw:DailyActivity rdf:type owl:Class ;
                      
+                     rdfs:label "Daily activity"@en ;
+                     
                      rdfs:subClassOf s4ehaw:Activity ;
                      
-                     rdfs:comment "The patient/user activities that occur during daytime."@en ;
-		     
-		     rdfs:label "Daily activity"@en .
+                     rdfs:comment "The patient/user activities that occur during daytime."@en .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/Data
 
 s4ehaw:Data rdf:type owl:Class ;
-
-            rdfs:comment  "A function has one or many data, for example a tracking function shall include latitude, longitude and speed data."@en ;
-
-            rdfs:label "Data"@en .
-
-
-
-### https://saref.etsi.org/s4ehaw/core/Device
-
-### saref:Device rdf:type owl:Class ;
-
-###              rdfs:comment "A tangible object designed to accomplish a particular task in households, common public buildings or offices. In order to accomplish this task, the device performs one or more functions. For example, a washing machine is designed to wash (task) and to accomplish this task it performs the start and stop function."@en ;
-	     
-###              rdfs:isDefinedBy saref: ;
-	     
-###              rdfs:label "Device"@en .
+            
+            rdfs:label "Data"@en ;
+            
+            rdfs:comment "A function has one or many data, for example a tracking function shall include latitude, longitude and speed data."@en .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/DeviceType
 
 s4ehaw:DeviceType rdf:type owl:Class ;
-
-            rdfs:comment  "A health device has a device type describing the physical characteristics of the health device."@en ;
-
-            rdfs:label "Device type"@en .
+                  
+                  rdfs:label "Device type"@en ;
+                  
+                  rdfs:comment "A health device has a device type describing the physical characteristics of the health device."@en .
 
 
 
@@ -1675,22 +1689,11 @@ s4ehaw:DeviceType rdf:type owl:Class ;
 
 s4ehaw:EventDrivenCommunicationFunction rdf:type owl:Class ;
                                         
+                                        rdfs:label "Event driven communication function"@en ;
+                                        
                                         rdfs:subClassOf s4ehaw:CommunicationFunction ;
-
-                                        rdfs:comment "BAN communication function way of working of the type event driven."@en ;
-
-                                        rdfs:label "Event driven communication function"@en .
-
-
-###  https://saref.etsi.org/saref4envi/FrequencyMeasurement
-
-s4envi:FrequencyMeasurement rdf:type owl:Class ;
-
-               rdfs:comment "Represents the measured value made over a frequency property. It is also linked to the frequency unit of measure in which the value is expressed and the timestamp of the measurement."@en ;
-
-               rdfs:isDefinedBy s4envi: ;
-
-               rdfs:label "Frequency measurement"@en .
+                                        
+                                        rdfs:comment "BAN communication function way of working of the type event driven."@en .
 
 
 
@@ -1698,33 +1701,11 @@ s4envi:FrequencyMeasurement rdf:type owl:Class ;
 
 s4ehaw:FunctionalDevice rdf:type owl:Class ;
                         
+                        rdfs:label "Functional device"@en ;
+                        
                         rdfs:subClassOf saref:FunctionRelated ;
-
-                        rdfs:comment "Functional Devices are non-purely eHealth/ageing-well devices that can be used for modelling/detecting activities or behaviours of patients/users, like for example beacons that can detect indoor positioning of a patient in a house."@en ;
-
-                        rdfs:label "Functional device"@en .
-
-
-###  https://saref.etsi.org/core/Function
-
-###  saref:Function rdf:type owl:Class ;
-
-###                 rdfs:comment "The functionality necessary to accomplish the task for which a device is designed for, .e.g. a temperature measurement function. A device can be designed to perform more than one function. Functions can be structured in categories (subclasses) that reflect different points of view, for example, considering the specific application area for which a function can be used (e.g., heart rate, temperature, motion, oxygen level...), or the capability that a function can support (e.g., receive, reply, notify, etc.), and so forth. "@en ;
-
-###                 rdfs:isDefinedBy saref: ;
-
-###                 rdfs:label "Function"@en .
-
-
-###  https://saref.etsi.org/saref/core/FunctionRelated
-
-###  saref:FunctionRelated rdf:type owl:Class ;
-
-###               rdfs:comment "A SAREF ontology category that considers Devices and their specification in terms of functions, states and services."@en ;
-	     
-###               rdfs:isDefinedBy saref: ;
-	     
-###               rdfs:label "Function related"@en .
+                        
+                        rdfs:comment "Functional Devices are non-purely eHealth/ageing-well devices that can be used for modelling/detecting activities or behaviours of patients/users, like for example beacons that can detect indoor positioning of a patient in a house."@en .
 
 
 
@@ -1732,23 +1713,23 @@ s4ehaw:FunctionalDevice rdf:type owl:Class ;
 
 s4ehaw:HealthActor rdf:type owl:Class ;
                    
-                   rdfs:comment "The eHealth system actors like e.g. caregivers, patients, users, helpers..."@en ;
-
-                   rdfs:label "Health actor"@en .
+                   rdfs:label "Health actor"@en ;
+                   
+                   rdfs:comment "The eHealth system actors like e.g. caregivers, patients, users, helpers..."@en .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/HealthActuator
 
 s4ehaw:HealthActuator rdf:type owl:Class ;
-             
-                    rdfs:subClassOf s4ehaw:HealthDevice ;
-		     
-                    rdfs:comment "Health-related Actuator, equivalent to SAREF Actuator"@en ;
-
-                    owl:equivalentClass saref:Actuator ;
-
-                    rdfs:label "Health actuator"@en .
+                      
+                      rdfs:label "Health actuator"@en ;
+                      
+                      owl:equivalentClass saref:Actuator ;
+                      
+                      rdfs:subClassOf s4ehaw:HealthDevice ;
+                      
+                      rdfs:comment "Health-related Actuator, equivalent to SAREF Actuator"@en .
 
 
 
@@ -1756,44 +1737,59 @@ s4ehaw:HealthActuator rdf:type owl:Class ;
 
 s4ehaw:HealthDevice rdf:type owl:Class ;
                     
+                    rdfs:label "Health Device"@en ;
+                    
                     rdfs:subClassOf saref:FunctionRelated ;
+                    
+                    rdfs:comment "Health Devices, e.g. BAN hub, health sensor/actuator/Wereable."@en .
 
-                    rdfs:comment "Health Devices, e.g. BAN hub, health sensor/actuator/Wereable."@en ;
 
-                    rdfs:label "Health Device"@en .
 
+###  https://saref.etsi.org/s4ehaw/HealthSensor
 
-###  https://saref.etsi.org/s4ehaw/Helper
+s4ehaw:HealthSensor rdf:type owl:Class ;
+                    
+                    rdfs:label "Health sensor"@en ,
+                               "Health-related Sensor, equivalent to SAREF Sensor" ;
+                    
+                    owl:equivalentClass saref:Sensor ;
+                    
+                    rdfs:subClassOf s4ehaw:HealthDevice .
 
-s4ehaw:Helper rdf:type owl:Class ;
-              
-              rdfs:subClassOf s4ehaw:HealthActor  ;
 
-              rdfs:comment "Helper of partients/users of a health system, e.g. a patient's relative."@en ;
 
-              rdfs:label "Helper"@en .
+###  https://saref.etsi.org/s4ehaw/HealthWearable
 
+s4ehaw:HealthWearable rdf:type owl:Class ;
+                      
+                      rdfs:label "Health wereable"@en ,
+                                 "Health-related Wearable, equivalent to SAREF4WEAR Wearable" ;
+                      
+                      owl:equivalentClass s4wear:Wearable ;
+                      
+                      rdfs:subClassOf s4ehaw:HealthDevice .
 
 
-###  https://saref.etsi.org/s4ehaw/BanHub
 
-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 GW."@en ;
+###  https://saref.etsi.org/s4ehaw/Helper
 
-              rdfs:label "BAN hub" .
+s4ehaw:Helper rdf:type owl:Class ;
+              
+              rdfs:label "Helper"@en ;
+              
+              rdfs:subClassOf s4ehaw:HealthActor ;
+              
+              rdfs:comment "Helper of partients/users of a health system, e.g. a patient's relative."@en .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/Impairment
 
 s4ehaw:Impairment rdf:type owl:Class ;
-
-                  rdfs:comment "Defined for patient's impairments modelling, e.g. deaf impairment, hearing impairement, handling impairment, visual impairement, blindI impairement, mobility impairement..."@en ;
-
-                  rdfs:label "Impairment" .
+                  
+                  rdfs:label "Impairment" ;
+                  
+                  rdfs:comment "Defined for patient's impairments modelling, e.g. deaf impairment, hearing impairement, handling impairment, visual impairement, blindI impairement, mobility impairement..."@en .
 
 
 
@@ -1801,21 +1797,21 @@ s4ehaw:Impairment rdf:type owl:Class ;
 
 s4ehaw:ImplantLocation rdf:type owl:Class ;
                        
+                       rdfs:label "Implant location"@en ;
+                       
                        rdfs:subClassOf s4ehaw:Location ;
-
-                       rdfs:comment "Implant Device (i.e. in body health device) position."@en ;
-
-                       rdfs:label "Implant location"@en .
+                       
+                       rdfs:comment "Implant Device (i.e. in body health device) position."@en .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/Interface
 
 s4ehaw:Interface rdf:type owl:Class ;
-
-                 rdfs:comment "Used for modelling the interfaces of a health device (e.g. Bluetooth, UWB, IEEE 802.15.6, serial interface...)."@en ;
-
-                 rdfs:label "Interface"@en .
+                 
+                 rdfs:label "Interface"@en ;
+                 
+                 rdfs:comment "Used for modelling the interfaces of a health device (e.g. Bluetooth, UWB, IEEE 802.15.6, serial interface...)."@en .
 
 
 
@@ -1823,11 +1819,11 @@ s4ehaw:Interface rdf:type owl:Class ;
 
 s4ehaw:LegalConstraint rdf:type owl:Class ;
                        
+                       rdfs:label "Legal constraint"@en ;
+                       
                        rdfs:subClassOf s4ehaw:Constraint ;
                        
-                       rdfs:comment "An empty container for describing the legal constraints a data can be submitted to, like e.g. anonymization."@en ;
-
-                       rdfs:label "Legal constraint"@en .
+                       rdfs:comment "An empty container for describing the legal constraints a data can be submitted to, like e.g. anonymization."@en .
 
 
 
@@ -1835,21 +1831,9 @@ s4ehaw:LegalConstraint rdf:type owl:Class ;
 
 s4ehaw:Location rdf:type owl:Class ;
                 
-                rdfs:comment "The location, i.e. a position against the body (on - body surface – or in the body – implant –) and a physical location (i.e. a postal address and/or a current geolocation geolocation when available)."@en ;
-
-                rdfs:label "Location"@en .
-
-
-
-### https://saref.etsi.org/s4ehaw/core/Measurement
-
-### saref:Measurement rdf:type owl:Class ;
-
-###                   rdfs:comment "Represents the measured value made over a property. It is also linked to the unit of measure in which the value is expressed and the timestamp of the measurement."@en ;
-	     
-###                   rdfs:isDefinedBy saref: ;
-	     
-###                   rdfs:label "Measurement"@en .
+                rdfs:label "Location"@en ;
+                
+                rdfs:comment "The location, i.e. a position against the body (on - body surface – or in the body – implant –) and a physical location (i.e. a postal address and/or a current geolocation geolocation when available)."@en .
 
 
 
@@ -1857,11 +1841,11 @@ s4ehaw:Location rdf:type owl:Class ;
 
 s4ehaw:MeasurementCollectionSession rdf:type owl:Class ;
                                     
+                                    rdfs:label "Measurement collection session"@en ;
+                                    
                                     rdfs:subClassOf saref:Task ;
-                
-                                    rdfs:comment "Task in which a health actor (mainly a patient or a user) is subject of measurement collection (recording) by both some measurement-related health Device (e.g. Sensor, Wereable, ECG Device...) and a health actor (mainly a caregiver)."@en ;
-
-                                    rdfs:label "Measurement collection session"@en .
+                                    
+                                    rdfs:comment "Task in which a health actor (mainly a patient or a user) is subject of measurement collection (recording) by both some measurement-related health Device (e.g. Sensor, Wereable, ECG Device...) and a health actor (mainly a caregiver)."@en .
 
 
 
@@ -1869,11 +1853,11 @@ s4ehaw:MeasurementCollectionSession rdf:type owl:Class ;
 
 s4ehaw:MeasurementFunction rdf:type owl:Class ;
                            
+                           rdfs:label "Measurement function"@en ;
+                           
                            rdfs:subClassOf saref:Function ;
-                
-                           rdfs:comment "The functionality necessary to accomplish the measurement task for which a measurement-related health Device (e.g. Sensor, Wereable, ECG Device...) is designed for, e.g. a heart rate measurement function. "@en ;
-
-                           rdfs:label "Measurement function"@en .
+                           
+                           rdfs:comment "The functionality necessary to accomplish the measurement task for which a measurement-related health Device (e.g. Sensor, Wereable, ECG Device...) is designed for, e.g. a heart rate measurement function. "@en .
 
 
 
@@ -1881,9 +1865,9 @@ s4ehaw:MeasurementFunction rdf:type owl:Class ;
 
 s4ehaw:Mode rdf:type owl:Class ;
             
-            rdf:comment "The dynamic characteristics of a eHealth Device that vary during its lifetime or its BAN lifetime."@en ;
-	    
-	    rdfs:label "Mode"@en .
+            rdfs:label "Mode"@en ;
+            
+            rdf:comment "The dynamic characteristics of a eHealth Device that vary during its lifetime or its BAN lifetime."@en .
 
 
 
@@ -1891,11 +1875,11 @@ s4ehaw:Mode rdf:type owl:Class ;
 
 s4ehaw:NocturnalActivity rdf:type owl:Class ;
                          
+                         rdfs:label "Nocturnal activity"@en ;
+                         
                          rdfs:subClassOf s4ehaw:Activity ;
                          
-                         rdfs:comment "The class of activities that occur during the night."@en ;
-
-                         rdfs:label "Nocturnal activity"@en .
+                         rdfs:comment "The class of activities that occur during the night."@en .
 
 
 
@@ -1903,11 +1887,11 @@ s4ehaw:NocturnalActivity rdf:type owl:Class ;
 
 s4ehaw:OnRequestCommunicationFunction rdf:type owl:Class ;
                                       
+                                      rdfs:label "On request communication function"@en ;
+                                      
                                       rdfs:subClassOf s4ehaw:CommunicationFunction ;
-
-                                      rdfs:comment "BAN communication function way of working of the type on request."@en ;
-
-                                      rdfs:label "On request communication function"@en .
+                                      
+                                      rdfs:comment "BAN communication function way of working of the type on request."@en .
 
 
 
@@ -1915,11 +1899,11 @@ s4ehaw:OnRequestCommunicationFunction rdf:type owl:Class ;
 
 s4ehaw:OperatingConstraint rdf:type owl:Class ;
                            
+                           rdfs:label "Operating constraint"@en ;
+                           
                            rdfs:subClassOf s4ehaw:Constraint ;
                            
-                           rdfs:comment "An empty container for describing the operating constraints of a device, e.g. recommended humidity and temperature range..."@en ;
-
-                           rdfs:label "Operating constraint"@en .
+                           rdfs:comment "An empty container for describing the operating constraints of a device, e.g. recommended humidity and temperature range..."@en .
 
 
 
@@ -1927,9 +1911,9 @@ s4ehaw:OperatingConstraint rdf:type owl:Class ;
 
 s4ehaw:Patient rdf:type owl:Class ;
                
-               rdfs:subClassOf s4ehaw:HealthActor ;
-
-               rdfs:label "Patient"@en .
+               rdfs:label "Patient"@en ;
+               
+               rdfs:subClassOf s4ehaw:HealthActor .
 
 
 
@@ -1937,11 +1921,11 @@ s4ehaw:Patient rdf:type owl:Class ;
 
 s4ehaw:PeriodicCommunicationFunction rdf:type owl:Class ;
                                      
+                                     rdfs:label "Periodic communication function"@en ;
+                                     
                                      rdfs:subClassOf s4ehaw:CommunicationFunction ;
-
-                                     rdfs:comment "BAN communication function way of working of the type periodic."@en ;
-
-                                     rdfs:label "Periodic communication function"@en .
+                                     
+                                     rdfs:comment "BAN communication function way of working of the type periodic."@en .
 
 
 
@@ -1949,43 +1933,43 @@ s4ehaw:PeriodicCommunicationFunction rdf:type owl:Class ;
 
 s4ehaw:PhysicalLocation rdf:type owl:Class ;
                         
+                        rdfs:label "Physical location"@en ;
+                        
                         rdfs:subClassOf s4ehaw:Location ;
                         
-                        rdfs:comment "The physical location, i.e. a postal address and a geolocation when available."@en ;
-
-                        rdfs:label "Physical location"@en .
+                        rdfs:comment "The physical location, i.e. a postal address and a geolocation when available."@en .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/Posture
 
 s4ehaw:Posture rdf:type owl:Class ;
-                        
-               rdfs:comment "The posture of a health actor (mainly a patient or a user), e.g. exercising, lying, running, sitting, walking..."@en ;
-
-               rdfs:label "Posture"@en .
+               
+               rdfs:label "Posture"@en ;
+               
+               rdfs:comment "The posture of a health actor (mainly a patient or a user), e.g. exercising, lying, running, sitting, walking..."@en .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/PowerSource
 
 s4ehaw:PowerSource rdf:type owl:Class ;
-
-                      rdfs:comment "The power sources of a health device, mainly describing energy source and battery related capabilities of the health device (number of power source, source type, rechargeable or not, available power level...)."@en ;
-
-                      rdfs:label "Power source"@en .
+                   
+                   rdfs:label "Power source"@en ;
+                   
+                   rdfs:comment "The power sources of a health device, mainly describing energy source and battery related capabilities of the health device (number of power source, source type, rechargeable or not, available power level...)."@en .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/ReminderCommand
 
 s4ehaw:ReminderCommand rdf:type owl:Class ;
-                        
-                        rdfs:subClassOf saref:NotifyCommand ;
-
-                        rdfs:comment "Command used for sending reminder notifications to health actors, e.g. pationts, users or Caregivers."@en ;
-
-                        rdfs:label "Reminder command"@en .
+                       
+                       rdfs:label "Reminder command"@en ;
+                       
+                       rdfs:subClassOf saref:NotifyCommand ;
+                       
+                       rdfs:comment "Command used for sending reminder notifications to health actors, e.g. pationts, users or Caregivers."@en .
 
 
 
@@ -1993,22 +1977,11 @@ s4ehaw:ReminderCommand rdf:type owl:Class ;
 
 s4ehaw:ResponsibleParty rdf:type owl:Class ;
                         
+                        rdfs:label "Responsible party"@en ;
+                        
                         rdfs:subClassOf s4ehaw:HealthActor ;
                         
-                        rdfs:comment "The legal entity responsible for a BAN, i.e. to contact in case of problem"@en ;
-
-                        rdfs:label "Responsible party"@en .
-
-
-###  https://saref.etsi.org/core/Service
-
-### saref:Service rdf:type owl:Class ;
-
-###               rdfs:comment "A service is a representation of a function to a network that makes the function discoverable, registerable, remotely controllable by other devices in the network. A service can represent one or more functions. A Service like e.g. a heart rate measurement service is offered by a health device that wants (a certain set of) its function(s) to be discoverable, registerable, remotely controllable by other health devices, health applications, or health actors, in the health-related network."@en ;
-
-###              rdfs:isDefinedBy saref: ;
-
-###              rdfs:label "Service"@en .
+                        rdfs:comment "The legal entity responsible for a BAN, i.e. to contact in case of problem"@en .
 
 
 
@@ -2016,9 +1989,9 @@ s4ehaw:ResponsibleParty rdf:type owl:Class ;
 
 s4ehaw:ServiceGrounding rdf:type owl:Class ;
                         
-                        rdfs:comment "How to access the service."@en ;
-
-                        rdfs:label "Service grounding"@en .
+                        rdfs:label "Service grounding"@en ;
+                        
+                        rdfs:comment "How to access the service."@en .
 
 
 
@@ -2026,9 +1999,9 @@ s4ehaw:ServiceGrounding rdf:type owl:Class ;
 
 s4ehaw:ServiceProcess rdf:type owl:Class ;
                       
-                      rdfs:comment "How the service works."@en ;
-
-                      rdfs:label "Service process"@en .
+                      rdfs:label "Service process"@en ;
+                      
+                      rdfs:comment "How the service works."@en .
 
 
 
@@ -2036,21 +2009,9 @@ s4ehaw:ServiceProcess rdf:type owl:Class ;
 
 s4ehaw:ServiceProfile rdf:type owl:Class ;
                       
-                      rdfs:comment "What the service does."@en ;
-
-                      rdfs:label "Service profile"@en .
-
-
-
-###  https://saref.etsi.org/core/Task
-
-### saref:Task rdf:type owl:Class ;
-
-###            rdfs:comment "The goal for which a device (e.g. a health device) is designed (from a user perspective). For example, a thermometer is designed for the task of measuring a temperature."@en ;
-
-###            rdfs:isDefinedBy saref: ;
-
-###            rdfs:label "Task"@en .
+                      rdfs:label "Service profile"@en ;
+                      
+                      rdfs:comment "What the service does."@en .
 
 
 
@@ -2058,6 +2019,8 @@ s4ehaw:ServiceProfile rdf:type owl:Class ;
 
 s4ehaw:TimeSeriesMeasurements rdf:type owl:Class ;
                               
+                              rdfs:label "Time series measurements" ;
+                              
                               rdfs:subClassOf saref:Measurement ,
                                               [ rdf:type owl:Restriction ;
                                                 owl:onProperty s4ehaw:hasValues ;
@@ -2068,32 +2031,19 @@ s4ehaw:TimeSeriesMeasurements rdf:type owl:Class ;
                                                 owl:allValuesFrom s4envi:FrequencyMeasurement
                                               ] ;
                               
-                              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 measurements" .
-
-
-
-###  https://saref.etsi.org/saref/core/UnitOfMeasure
+                              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." .
 
-###  saref:UnitOfMeasure rdf:type owl:Class ;
-
-###                      rdfs:comment "The unit of measure is a standard for measurement of a quantity, such as a Property. For example, Power is a property and Watt is a unit of power that represents a definite predetermined power: when we say 10 Watt, we actually mean 10 times the definite predetermined power called \"watt\". This definition is based on the definition of unit of measure in the Ontology of units of Measure (OM)."@en ;
-
-###                      rdfs:isDefinedBy saref: ;
-
-###                      rdfs:label "Unit of measure"@en .
 
 
 ###  https://saref.etsi.org/s4ehaw/User
 
 s4ehaw:User rdf:type owl:Class ;
             
+            rdfs:label "Service profile"@en ;
+            
             rdfs:subClassOf s4ehaw:HealthActor ;
-                      
-                      rdfs:comment "A health actor that is not a patient and is using BANs or health devices."@en ;
-
-                      rdfs:label "Service profile"@en .
+            
+            rdfs:comment "A health actor that is not a patient and is using BANs or health devices."@en .
 
 
 
@@ -2101,221 +2051,233 @@ s4ehaw:User rdf:type owl:Class ;
 
 s4ehaw:ValidityConstraint rdf:type owl:Class ;
                           
+                          rdfs:label "Validity constraint"@en ;
+                          
                           rdfs:subClassOf s4ehaw:Constraint ;
-                      
-                          rdfs:comment "Data may have validity constraint such as allowable value range."@en ;
+                          
+                          rdfs:comment "Data may have validity constraint such as allowable value range."@en .
 
-                          rdfs:label "Validity constraint"@en .
 
 
+###  https://saref.etsi.org/s4wear/Wearable
 
-###  https://saref.etsi.org/s4ehaw/HealthWearable
+s4wear:Wearable rdf:type owl:Class .
 
-s4ehaw:HealthWearable rdf:type owl:Class ;
-             
-                     rdfs:subClassOf s4ehaw:HealthDevice ;
-		     
-                     rdfs:label "Health-related Wearable, equivalent to SAREF4WEAR Wearable" ;
 
-                     owl:equivalentClass s4wear:Wearable ;
 
-                     rdfs:label "Health wereable"@en .
+###  https://saref.etsi.org/saref/core/Actuator
 
+saref:Actuator rdf:type owl:Class .
 
-###  https://saref.etsi.org/s4ehaw/HealthSensor
 
-s4ehaw:HealthSensor rdf:type owl:Class ;
-             
-                    rdfs:subClassOf s4ehaw:HealthDevice ;
-		     
-                    rdfs:label "Health-related Sensor, equivalent to SAREF Sensor" ;
 
-                    owl:equivalentClass saref:Sensor ;
+###  https://saref.etsi.org/saref/core/Command
 
-                     rdfs:label "Health sensor"@en .
+saref:Command rdf:type owl:Class .
 
 
 
+###  https://saref.etsi.org/saref/core/Function
 
-#################################################################
-#
-#    Individuals
-#
-#################################################################
+saref:Function rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/ECGdeviceFrequency
 
-s4ehawInst:ECGdeviceFrequency rdf:type owl:NamedIndividual ,
-                                 s4envi:Frequency .
+###  https://saref.etsi.org/saref/core/FunctionRelated
 
+saref:FunctionRelated rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/assistedLiving
 
-s4ehawInst:assistedLiving rdf:type s4ehaw:BanApplicationDomain ,
-                             owl:NamedIndividual .
+###  https://saref.etsi.org/saref/core/Measurement
 
+saref:Measurement rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/blindImpairment
 
-s4ehawInst:blindImpairment rdf:type s4ehaw:Impairment ,
-                              owl:NamedIndividual .
+###  https://saref.etsi.org/saref/core/NotifyCommand
 
+saref:NotifyCommand rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/deafImpairment
 
-s4ehawInst:deafImpairment rdf:type s4ehaw:Impairment ,
-                             owl:NamedIndividual .
+###  https://saref.etsi.org/saref/core/Property
 
+saref:Property rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/emergency
 
-s4ehawInst:emergency rdf:type s4ehaw:BanApplicationDomain ,
-                        owl:NamedIndividual .
+###  https://saref.etsi.org/saref/core/Sensor
 
+saref:Sensor rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/exercising
 
-s4ehawInst:exercising rdf:type s4ehaw:Posture ,
-                         owl:NamedIndividual .
+###  https://saref.etsi.org/saref/core/Task
 
+saref:Task rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/handlingImpairment
 
-s4ehawInst:handlingImpairment rdf:type s4ehaw:Impairment ,
-                                 owl:NamedIndividual .
+###  https://saref.etsi.org/saref/core/UnitOfMeasure
 
+saref:UnitOfMeasure rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/healthcare
 
-s4ehawInst:healthcare rdf:type s4ehaw:BanApplicationDomain ,
-                         owl:NamedIndividual .
+###  https://saref.etsi.org/saref4envi/Frequency
 
+s4envi:Frequency rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/hearingImpairment
 
-s4ehawInst:hearingImpairment rdf:type s4ehaw:Impairment ,
-                                owl:NamedIndividual .
+###  https://saref.etsi.org/saref4envi/FrequencyMeasurement
 
+s4envi:FrequencyMeasurement rdf:type owl:Class ;
+                            
+                            rdfs:label "Frequency measurement"@en ;
+                            
+                            rdfs:comment "Represents the measured value made over a frequency property. It is also linked to the frequency unit of measure in which the value is expressed and the timestamp of the measurement."@en ;
+                            
+                            rdfs:isDefinedBy s4envi: .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/lying
 
-s4ehawInst:lying rdf:type s4ehaw:Posture ,
-                    owl:NamedIndividual .
+###  https://saref.etsi.org/saref4envi/FrequencyUnit
 
+s4envi:FrequencyUnit rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/mobilityImpairment
 
-s4ehawInst:mobilityImpairment rdf:type s4ehaw:Impairment ,
-                                 owl:NamedIndividual .
 
 
+#################################################################
+#
+#    Individuals
+#
+#################################################################
 
-###  https://saref.etsi.org/s4ehaw/instances/pervasiveComputing
 
-s4ehawInst:pervasiveComputing rdf:type s4ehaw:BanApplicationDomain ,
-                                 owl:NamedIndividual .
+###  http://www.wurvoc.org/vocabularies/om-1.8/hertz
 
+<http://www.wurvoc.org/vocabularies/om-1.8/hertz> rdf:type owl:NamedIndividual ,
+                                                           s4envi:FrequencyUnit .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/running
 
-s4ehawInst:running rdf:type s4ehaw:Posture ,
-                      owl:NamedIndividual .
+###  https://saref.etsi.org/s4ehaw/
 
+<https://saref.etsi.org/s4ehaw/> rdf:type voaf:Vocabulary ,
+                                          owl:NamedIndividual .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/safety
 
-s4ehawInst:safety rdf:type s4ehaw:BanApplicationDomain ,
-                     owl:NamedIndividual .
+###  https://saref.etsi.org/s4ehaw/Caregiver_Id_ABCD0001
 
+s4ehaw:Caregiver_Id_ABCD0001 rdf:type owl:NamedIndividual ,
+                                      s4ehaw:Caregiver ;
+                             
+                             s4ehaw:hasPhysicalLocation s4ehawInst:Location_X1_Y2 ;
+                             
+                             s4ehaw:hasActivity s4ehawInst:RecordingECGSession_01 .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/sitting
 
-s4ehawInst:sitting rdf:type s4ehaw:Posture ,
-                      owl:NamedIndividual .
+###  https://saref.etsi.org/s4ehaw/instances/AcceleroemeterX_ECGDevice
 
+s4ehawInst:AcceleroemeterX_ECGDevice rdf:type owl:NamedIndividual ,
+                                              saref:Sensor .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/sportTraining
 
-s4ehawInst:sportTraining rdf:type s4ehaw:BanApplicationDomain ,
-                            owl:NamedIndividual .
+###  https://saref.etsi.org/s4ehaw/instances/AcceleroemeterY_ECGDevice
 
+s4ehawInst:AcceleroemeterY_ECGDevice rdf:type owl:NamedIndividual ,
+                                              saref:Sensor .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/telemedicine
 
-s4ehawInst:telemedicine rdf:type s4ehaw:BanApplicationDomain ,
-                           owl:NamedIndividual .
+###  https://saref.etsi.org/s4ehaw/instances/AcceleroemeterZ_ECGDevice
 
+s4ehawInst:AcceleroemeterZ_ECGDevice rdf:type owl:NamedIndividual ,
+                                              saref:Sensor .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/visualImpairment
 
-s4ehawInst:visualImpairment rdf:type s4ehaw:Impairment ,
-                               owl:NamedIndividual .
+###  https://saref.etsi.org/s4ehaw/instances/Driver_Id_XPTO0001
 
+s4ehawInst:Driver_Id_XPTO0001 rdf:type owl:NamedIndividual ,
+                                       s4ehaw:HealthActor ;
+                              
+                              s4ehaw:hasActivity s4ehawInst:RecordingECGSession_01 .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/walking
 
-s4ehawInst:walking rdf:type s4ehaw:Posture ,
-                      owl:NamedIndividual .
+###  https://saref.etsi.org/s4ehaw/instances/ECGLead_III_code131389
 
+s4ehawInst:ECGLead_III_code131389 rdf:type owl:NamedIndividual ,
+                                           saref:Sensor .
 
 
-###  http://www.wurvoc.org/vocabularies/om-1.8/hertz
 
-<http://www.wurvoc.org/vocabularies/om-1.8/hertz> rdf:type owl:NamedIndividual ,
-                                                           s4envi:FrequencyUnit .
+###  https://saref.etsi.org/s4ehaw/instances/ECGLead_II_code131330
 
+s4ehawInst:ECGLead_II_code131330 rdf:type owl:NamedIndividual ,
+                                          saref:Sensor .
 
 
-###  https://saref.etsi.org/s4ehaw/
 
-<https://saref.etsi.org/s4ehaw/> rdf:type voaf:Vocabulary ,
-                                          owl:NamedIndividual .
+###  https://saref.etsi.org/s4ehaw/instances/ECGLead_I_code131329
 
+s4ehawInst:ECGLead_I_code131329 rdf:type owl:NamedIndividual ,
+                                         saref:Sensor ;
+                                
+                                saref:makesMeasurement s4ehawInst:ECGMeasurementsSeries_Example001 .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/ECGLead_III_code131389
 
-s4ehawInst:ECGLead_III_code131389 rdf:type owl:NamedIndividual ,
-                                           <https://w3id.org/saref#Sensor> .
+###  https://saref.etsi.org/s4ehaw/instances/ECGLead_Vx_RL_code131389
 
+s4ehawInst:ECGLead_Vx_RL_code131389 rdf:type owl:NamedIndividual ,
+                                             saref:Sensor .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/ECGLead_II_code131330
 
-s4ehawInst:ECGLead_II_code131330 rdf:type owl:NamedIndividual ,
-                                          <https://w3id.org/saref#Sensor> .
+###  https://saref.etsi.org/s4ehaw/instances/ECGMeasurementsSeries_Example001
 
+s4ehawInst:ECGMeasurementsSeries_Example001 rdf:type owl:NamedIndividual ,
+                                                     s4ehaw:TimeSeriesMeasurements ;
+                                            
+                                            saref:hasTimestamp "2018-04-22T22:15:30"^^xsd:dateTime ;
+                                            
+                                            s4ehaw:hasValues "2037" ,
+                                                             "2062" ,
+                                                             "2043" ,
+                                                             "2060" ,
+                                                             "2041" ,
+                                                             "2047" ;
+                                            
+                                            saref:isMeasuredIn s4ehawInst:ElectricPotential_MilliVolts ;
+                                            
+                                            s4envi:hasFrequencyMeasurement s4ehawInst:FrequencyOf256Hertz ;
+                                            
+                                            saref:relatesToProperty s4ehawInst:HeartElectricalActivity_Person .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/ECGLead_I_code131329
 
-s4ehawInst:ECGLead_I_code131329 rdf:type owl:NamedIndividual ,
-                                         <https://w3id.org/saref#Sensor> .
+###  https://saref.etsi.org/s4ehaw/instances/ECGdeviceFrequency
 
+s4ehawInst:ECGdeviceFrequency rdf:type owl:NamedIndividual ,
+                                       s4envi:Frequency .
 
 
-###  https://saref.etsi.org/s4ehaw/instances/ECGLead_Vx_RL_code131389
 
-s4ehawInst:ECGLead_Vx_RL_code131389 rdf:type owl:NamedIndividual ,
-                                             <https://w3id.org/saref#Sensor> .
+###  https://saref.etsi.org/s4ehaw/instances/ElectricPotential_MilliVolts
+
+s4ehawInst:ElectricPotential_MilliVolts rdf:type owl:NamedIndividual ,
+                                                 saref:UnitOfMeasure ;
+                                        
+                                        rdfs:label "MilliVolts (mV)" .
 
 
 
@@ -2326,45 +2288,190 @@ s4ehawInst:FrequencyOf256Hertz rdf:type owl:NamedIndividual ,
                                
                                rdfs:label "256Hz frequency" ;
                                
-                               <https://w3id.org/saref#hasValue> "256"^^xsd:int ;
+                               saref:hasValue "256"^^xsd:int ;
                                
-                               <https://w3id.org/saref#relatesToProperty> s4ehawInst:ECGdeviceFrequency ;
+                               saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/hertz> ;
                                
-                               <https://w3id.org/saref#isMeasuredIn> <http://www.wurvoc.org/vocabularies/om-1.8/hertz> .
+                               saref:relatesToProperty s4ehawInst:ECGdeviceFrequency .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/HeartElectricalActivity_Person
+
+s4ehawInst:HeartElectricalActivity_Person rdf:type owl:NamedIndividual ,
+                                                   saref:Property .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/Location_X1_Y2
+
+s4ehawInst:Location_X1_Y2 rdf:type owl:NamedIndividual ,
+                                   s4ehaw:PhysicalLocation .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/instances/RecordingECGSession_01
 
-s4ehawInst:RecordingECGSession_01 rdf:type s4ehaw:MeasurementCollectionSession ,
-                                           owl:NamedIndividual ;
+s4ehawInst:RecordingECGSession_01 rdf:type owl:NamedIndividual ,
+                                           s4ehaw:MeasurementCollectionSession ;
                                   
                                   rdfs:label "Recording ECG session 0001" ;
                                   
-                                  rdfs:comment "An ECG recording session taken during a trip (truck driver)." .
+                                  rdfs:comment "An ECG recording session taken during a trip (truck driver)." ;
+                                  
+                                  saref:consistsOf s4ehawInst:ECGMeasurementsSeries_Example001 .
 
 
 
 ###  https://saref.etsi.org/s4ehaw/instances/Shimmer3ECG_unit_T9JRN42
 
-s4ehawInst:Shimmer3ECG_unit_T9JRN42 rdf:type s4ehaw:HealthDevice ,
-                                             s4ehaw:HealthWearable ,
-                                             owl:NamedIndividual ;
+s4ehawInst:Shimmer3ECG_unit_T9JRN42 rdf:type owl:NamedIndividual ,
+                                             s4ehaw:HealthDevice ,
+                                             s4ehaw:HealthWearable ;
                                     
-                                    rdfs:label "Shimmer3 ECG unit T9J-RN42" ;
+                                    rdfs:label "ECG Device: Shimmer3 ECG unit T9J-RN42" ;
                                     
-                                    rdfs:comment "Shimmer3 EXG unit: device bought for INTER-IoT-EWS project, composed of ECG sensors and other features (e.g. Accelerometer). " ;
+                                    rdfs:comment "Shimmer3 EXG unit: device used for INTER-IoT-EWS project. " ;
                                     
                                     rdfs:seeAlso "http://www.shimmersensing.com/products/ecg-development-kit#specifications-tab" ;
                                     
-                                    <https://w3id.org/saref#consistsOf> s4ehawInst:ECGLead_III_code131389 ,
-                                                                        s4ehawInst:ECGLead_II_code131330 ,
-                                                                        s4ehawInst:ECGLead_I_code131329 ,
-                                                                        s4ehawInst:ECGLead_Vx_RL_code131389 ;
+                                    saref:consistsOf s4ehawInst:AcceleroemeterX_ECGDevice ,
+                                                     s4ehawInst:AcceleroemeterY_ECGDevice ,
+                                                     s4ehawInst:AcceleroemeterZ_ECGDevice ,
+                                                     s4ehawInst:ECGLead_III_code131389 ,
+                                                     s4ehawInst:ECGLead_II_code131330 ,
+                                                     s4ehawInst:ECGLead_I_code131329 ,
+                                                     s4ehawInst:ECGLead_Vx_RL_code131389 ;
                                     
                                     s4envi:hasFrequencyMeasurement s4ehawInst:FrequencyOf256Hertz ;
                                     
-                                    <https://w3id.org/saref#accomplishes> s4ehawInst:RecordingECGSession_01 .
+                                    saref:accomplishes s4ehawInst:RecordingECGSession_01 .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/assistedLiving
+
+s4ehawInst:assistedLiving rdf:type owl:NamedIndividual ,
+                                   s4ehaw:BanApplicationDomain .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/blindImpairment
+
+s4ehawInst:blindImpairment rdf:type owl:NamedIndividual ,
+                                    s4ehaw:Impairment .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/deafImpairment
+
+s4ehawInst:deafImpairment rdf:type owl:NamedIndividual ,
+                                   s4ehaw:Impairment .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/emergency
+
+s4ehawInst:emergency rdf:type owl:NamedIndividual ,
+                              s4ehaw:BanApplicationDomain .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/exercising
+
+s4ehawInst:exercising rdf:type owl:NamedIndividual ,
+                               s4ehaw:Posture .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/handlingImpairment
+
+s4ehawInst:handlingImpairment rdf:type owl:NamedIndividual ,
+                                       s4ehaw:Impairment .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/healthcare
+
+s4ehawInst:healthcare rdf:type owl:NamedIndividual ,
+                               s4ehaw:BanApplicationDomain .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/hearingImpairment
+
+s4ehawInst:hearingImpairment rdf:type owl:NamedIndividual ,
+                                      s4ehaw:Impairment .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/lying
+
+s4ehawInst:lying rdf:type owl:NamedIndividual ,
+                          s4ehaw:Posture .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/mobilityImpairment
+
+s4ehawInst:mobilityImpairment rdf:type owl:NamedIndividual ,
+                                       s4ehaw:Impairment .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/pervasiveComputing
+
+s4ehawInst:pervasiveComputing rdf:type owl:NamedIndividual ,
+                                       s4ehaw:BanApplicationDomain .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/running
+
+s4ehawInst:running rdf:type owl:NamedIndividual ,
+                            s4ehaw:Posture .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/safety
+
+s4ehawInst:safety rdf:type owl:NamedIndividual ,
+                           s4ehaw:BanApplicationDomain .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/sitting
+
+s4ehawInst:sitting rdf:type owl:NamedIndividual ,
+                            s4ehaw:Posture .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/sportTraining
+
+s4ehawInst:sportTraining rdf:type owl:NamedIndividual ,
+                                  s4ehaw:BanApplicationDomain .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/telemedicine
+
+s4ehawInst:telemedicine rdf:type owl:NamedIndividual ,
+                                 s4ehaw:BanApplicationDomain .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/visualImpairment
+
+s4ehawInst:visualImpairment rdf:type owl:NamedIndividual ,
+                                     s4ehaw:Impairment .
+
+
+
+###  https://saref.etsi.org/s4ehaw/instances/walking
+
+s4ehawInst:walking rdf:type owl:NamedIndividual ,
+                            s4ehaw:Posture .