diff --git a/ontology/saref4wear.ttl b/ontology/saref4wear.ttl
index 4a0096a3bfac5e4e01eabe2eb29b4f1f9d79220b..fa130f3392e7bb42a510de1007f5bd1b55e9f467 100644
--- a/ontology/saref4wear.ttl
+++ b/ontology/saref4wear.ttl
@@ -8,6 +8,8 @@
 @prefix skos: <http://www.w3.org/2004/02/skos/core#> .
 @prefix vann: <http://purl.org/vocab/vann/> .
 @prefix voaf: <http://purl.org/vocommons/voaf#> .
+@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
+@prefix geosp: <http://www.opengis.net/ont/geosparql#> .
 @prefix saref: <https://w3id.org/saref#> .
 @prefix s4wear: <https://saref.etsi.org/s4wear#> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
@@ -84,18 +86,36 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
 #    Object Properties
 #################################################################
 
+###  http://www.opengis.net/ont/geosparql#hasGeometry
+geosp:hasGeometry rdf:type owl:ObjectProperty ;
+                  rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql#> ;
+                  rdfs:label "hasGeometry"@en .
+
+
+###  http://www.opengis.net/ont/geosparql#sfContains
+geosp:sfContains rdf:type owl:ObjectProperty ;
+                 rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql#> ;
+                 rdfs:label "sfContains"@en .
+
+
+###  http://www.opengis.net/ont/geosparql#sfWithin
+geosp:sfWithin rdf:type owl:ObjectProperty ;
+               rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql#> ;
+               rdfs:label "sfWithin"@en .
+
+
+###  http://www.w3.org/2003/01/geo/wgs84_pos#location
+geo:location rdf:type owl:ObjectProperty ;
+                   rdfs:isDefinedBy <http://www.w3.org/2003/01/geo/wgs84_pos#> ;
+                   rdfs:label "location" .
+
+
 ###  https://saref.etsi.org/s4wear#canSendInformationTo
 s4wear:canSendInformationTo rdf:type owl:ObjectProperty ;
                             rdfs:domain s4wear:Wearable ;
                             rdfs:range s4wear:Wearable .
 
 
-###  https://saref.etsi.org/s4wear#hasLocation
-s4wear:hasLocation rdf:type owl:ObjectProperty ;
-                   rdfs:domain owl:Thing ;
-                   rdfs:range s4wear:Location .
-
-
 ###  https://saref.etsi.org/s4wear#interactsWith
 s4wear:interactsWith rdf:type owl:ObjectProperty ;
                      rdfs:domain s4wear:User ;
@@ -225,18 +245,6 @@ s4wear:eventType rdf:type owl:DatatypeProperty ;
                  rdfs:range xsd:string .
 
 
-###  https://saref.etsi.org/s4wear#latitude
-s4wear:latitude rdf:type owl:DatatypeProperty ;
-                rdfs:domain s4wear:Location ;
-                rdfs:range xsd:double .
-
-
-###  https://saref.etsi.org/s4wear#longitude
-s4wear:longitude rdf:type owl:DatatypeProperty ;
-                 rdfs:domain s4wear:Location ;
-                 rdfs:range xsd:double .
-
-
 ###  https://saref.etsi.org/s4wear#meansOfTransport
 s4wear:meansOfTransport rdf:type owl:DatatypeProperty ;
                         rdfs:domain s4wear:Wearer ;
@@ -279,6 +287,49 @@ voaf:Vocabulary rdf:type owl:Class .
 foaf:Person rdf:type owl:Class .
 
 
+###  http://www.opengis.net/ont/geosparql#Feature
+geosp:Feature rdf:type owl:Class ;
+              rdfs:subClassOf geosp:SpatialObject ;
+              rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql#> ;
+              rdfs:label "Feature"@en .
+
+
+###  http://www.opengis.net/ont/geosparql#Geometry
+geosp:Geometry rdf:type owl:Class ;
+               rdfs:subClassOf geosp:SpatialObject ;
+               rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql#> ;
+               rdfs:label "Geometry"@en .
+
+
+###  http://www.opengis.net/ont/geosparql#SpatialObject
+geosp:SpatialObject rdf:type owl:Class ;
+                    rdfs:subClassOf [ rdf:type owl:Restriction ;
+                                      owl:onProperty geosp:hasGeometry ;
+                                      owl:allValuesFrom geosp:Geometry
+                                    ] ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty geosp:sfContains ;
+                                      owl:allValuesFrom geosp:SpatialObject
+                                    ] ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty geosp:sfWithin ;
+                                      owl:allValuesFrom geosp:SpatialObject
+                                    ] ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty geo:location ;
+                                      owl:allValuesFrom geo:Point
+                                    ] ;
+                    rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql#> ;
+                    rdfs:label "Spatial object"@en .
+
+
+###  http://www.w3.org/2003/01/geo/wgs84_pos#Point
+geo:Point rdf:type owl:Class ;
+                rdfs:subClassOf geosp:Geometry ;
+                rdfs:isDefinedBy <http://www.w3.org/2003/01/geo/wgs84_pos#> ;
+                rdfs:label "Point"@en .
+
+
 ###  https://saref.etsi.org/s4wear#Area
 s4wear:Area rdf:type owl:Class .
 
@@ -348,11 +399,8 @@ s4wear:Information rdf:type owl:Class .
 
 ###  https://saref.etsi.org/s4wear#LivingOrganism
 s4wear:LivingOrganism rdf:type owl:Class ;
-                      rdfs:subClassOf s4wear:Entity .
-
-
-###  https://saref.etsi.org/s4wear#Location
-s4wear:Location rdf:type owl:Class .
+                      rdfs:subClassOf s4wear:Entity ,
+                                      geosp:Feature .
 
 
 ###  https://saref.etsi.org/s4wear#NearBodyWearable
@@ -386,7 +434,8 @@ s4wear:Parent rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/s4wear#PhysicalObject
 s4wear:PhysicalObject rdf:type owl:Class ;
-                      rdfs:subClassOf s4wear:Entity .
+                      rdfs:subClassOf s4wear:Entity ,
+                                      geosp:Feature .
 
 
 ###  https://saref.etsi.org/s4wear#PositionedWearable
@@ -470,7 +519,8 @@ The definition of this concept satisfies the requirement WEAR-2."""@en ;
 
 ###  https://saref.etsi.org/saref#Device
 saref:Device rdf:type owl:Class ;
-             rdfs:subClassOf [ rdf:type owl:Restriction ;
+             rdfs:subClassOf s4wear:PhysicalObject ,
+                             [ rdf:type owl:Restriction ;
                                owl:onProperty saref:controlsProperty ;
                                owl:allValuesFrom saref:Property
                              ] ,