diff --git a/ontology/saref4wear.ttl b/ontology/saref4wear.ttl
index 7683e492e9073624577efb7e0cc18ea6e19cc20d..94a14eb52e032e056d2384219896801c061e2b90 100644
--- a/ontology/saref4wear.ttl
+++ b/ontology/saref4wear.ttl
@@ -193,18 +193,18 @@ s4wear:actsOn rdf:type owl:ObjectProperty ;
               rdfs:range s4wear:ActuableObject .
 
 
+###  https://saref.etsi.org/saref4wear/hasDeviceInformation
+s4wear:hasDeviceInformation rdf:type owl:ObjectProperty ;
+                            rdfs:domain saref:Device ;
+                            rdfs:range s4wear:Information .
+
+
 ###  https://saref.etsi.org/saref4wear/hasInterface
 s4wear:hasInterface rdf:type owl:ObjectProperty ;
                     rdfs:domain saref:Device ;
                     rdfs:range s4wear:Interface .
 
 
-###  https://saref.etsi.org/saref4wear/hasLocation
-s4wear:hasLocation rdf:type owl:ObjectProperty ;
-                   rdfs:domain owl:Thing ;
-                   rdfs:range s4wear:Location .
-
-
 ###  https://saref.etsi.org/saref4wear/hasPowerSupply
 s4wear:hasPowerSupply rdf:type owl:ObjectProperty ;
                       rdfs:domain saref:Device ;
@@ -214,7 +214,7 @@ s4wear:hasPowerSupply rdf:type owl:ObjectProperty ;
 ###  https://saref.etsi.org/saref4wear/hasSensor
 s4wear:hasSensor rdf:type owl:ObjectProperty ;
                  rdfs:domain saref:Device ;
-                 rdfs:range s4wear:Sensor .
+                 rdfs:range saref:Sensor .
 
 
 ###  https://saref.etsi.org/saref4wear/interactsWith
@@ -232,7 +232,7 @@ s4wear:isActedBy rdf:type owl:ObjectProperty ;
 ###  https://saref.etsi.org/saref4wear/isActuatedBy
 s4wear:isActuatedBy rdf:type owl:ObjectProperty ;
                     rdfs:domain saref:Device ;
-                    rdfs:range s4wear:Actuator .
+                    rdfs:range saref:Actuator .
 
 
 ###  https://saref.etsi.org/saref4wear/isLocated
@@ -325,12 +325,6 @@ s4wear:emittedTemperature rdf:type owl:DatatypeProperty ;
                           rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/saref4wear/eventType
-s4wear:eventType rdf:type owl:DatatypeProperty ;
-                 rdfs:domain s4city:Event ;
-                 rdfs:range xsd:string .
-
-
 ###  https://saref.etsi.org/saref4wear/followsPolicies
 s4wear:followsPolicies rdf:type owl:DatatypeProperty ;
                        rdfs:domain s4wear:Wearable ;
@@ -393,12 +387,6 @@ s4wear:hasWeight rdf:type owl:DatatypeProperty ;
                  rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/saref4wear/latitude
-s4wear:latitude rdf:type owl:DatatypeProperty ;
-                rdfs:domain s4wear:Location ;
-                rdfs:range xsd:double .
-
-
 ###  https://saref.etsi.org/saref4wear/meansOfTransport
 s4wear:meansOfTransport rdf:type owl:DatatypeProperty ;
                         rdfs:domain saref:FeatureOfInterest ;
@@ -472,6 +460,11 @@ geo:Point rdf:type owl:Class ;
 foaf:Person rdf:type owl:Class .
 
 
+###  https://saref.etsi.org/saref/Actuator
+saref:Actuator rdf:type owl:Class ;
+               rdfs:subClassOf s4wear:WearableComponent .
+
+
 ###  https://saref.etsi.org/saref/Device
 saref:Device rdf:type owl:Class ;
              rdfs:subClassOf s4wear:PhysicalObject ,
@@ -487,6 +480,10 @@ saref:Device rdf:type owl:Class ;
                                owl:onProperty saref:measuresProperty ;
                                owl:allValuesFrom saref:Property
                              ] ,
+                             [ rdf:type owl:Restriction ;
+                               owl:onProperty s4wear:hasDeviceInformation ;
+                               owl:allValuesFrom s4wear:Information
+                             ] ,
                              [ rdf:type owl:Restriction ;
                                owl:onProperty s4wear:interactsWith ;
                                owl:allValuesFrom saref:Device
@@ -565,7 +562,8 @@ saref:SensingFunction rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref/Sensor
 saref:Sensor rdf:type owl:Class ;
-             rdfs:subClassOf saref:Device ;
+             rdfs:subClassOf saref:Device ,
+                             s4wear:WearableComponent ;
              rdfs:isDefinedBy saref: ;
              rdfs:label "Sensor"@en .
 
@@ -617,11 +615,6 @@ s4wear:ActionFunction rdf:type owl:Class ;
 s4wear:ActuableObject rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4wear/Actuator
-s4wear:Actuator rdf:type owl:Class ;
-                rdfs:subClassOf s4wear:WearableComponent .
-
-
 ###  https://saref.etsi.org/saref4wear/Area
 s4wear:Area rdf:type owl:Class .
 
@@ -651,10 +644,6 @@ s4wear:ControlFunction rdf:type owl:Class ;
                        rdfs:subClassOf saref:Function .
 
 
-###  https://saref.etsi.org/saref4wear/Device
-s4wear:Device rdf:type owl:Class .
-
-
 ###  https://saref.etsi.org/saref4wear/ElectricalSafety
 s4wear:ElectricalSafety rdf:type owl:Class ;
                         rdfs:subClassOf s4wear:Information .
@@ -701,8 +690,9 @@ s4wear:LivingOrganism rdf:type owl:Class ;
                                       saref:FeatureOfInterest .
 
 
-###  https://saref.etsi.org/saref4wear/Location
-s4wear:Location rdf:type owl:Class .
+###  https://saref.etsi.org/saref4wear/MemoryStorage
+s4wear:MemoryStorage rdf:type owl:Class ;
+                     rdfs:subClassOf s4wear:WearableComponent .
 
 
 ###  https://saref.etsi.org/saref4wear/MusicEvents
@@ -752,12 +742,7 @@ s4wear:PositionedWearable rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref4wear/PowerSupply
 s4wear:PowerSupply rdf:type owl:Class ;
-                   rdfs:subClassOf s4wear:Device .
-
-
-###  https://saref.etsi.org/saref4wear/Sensor
-s4wear:Sensor rdf:type owl:Class ;
-              rdfs:subClassOf s4wear:WearableComponent .
+                   rdfs:subClassOf saref:Device .
 
 
 ###  https://saref.etsi.org/saref4wear/Software
@@ -775,11 +760,6 @@ s4wear:StaffMember rdf:type owl:Class ;
                    rdfs:subClassOf s4wear:LivingOrganism .
 
 
-###  https://saref.etsi.org/saref4wear/Storage
-s4wear:Storage rdf:type owl:Class ;
-               rdfs:subClassOf s4wear:WearableComponent .
-
-
 ###  https://saref.etsi.org/saref4wear/TextileBasedDevice
 s4wear:TextileBasedDevice rdf:type owl:Class ;
                           rdfs:subClassOf s4wear:TextileBasedWearable .
@@ -787,7 +767,7 @@ s4wear:TextileBasedDevice rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref4wear/TextileBasedSensor
 s4wear:TextileBasedSensor rdf:type owl:Class ;
-                          rdfs:subClassOf s4wear:Sensor .
+                          rdfs:subClassOf saref:Sensor .
 
 
 ###  https://saref.etsi.org/saref4wear/TextileBasedWearable