diff --git a/ontology/saref4envi.ttl b/ontology/saref4envi.ttl
index 91f89009a99b087725426bccf01e18ffa30db6e7..189d81be316acca9b31ee8ab5c515b83bfca462d 100644
--- a/ontology/saref4envi.ttl
+++ b/ontology/saref4envi.ttl
@@ -1,5 +1,4 @@
 @prefix : <https://saref.etsi.org/saref4envi/> .
-@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
@@ -10,6 +9,7 @@
 @prefix s4envi: <https://saref.etsi.org/saref4envi/> .
 @prefix saref: <https://saref.etsi.org/core/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
+@prefix geo: <http://www.opengis.net/ont/geosparql#>.
 @base <https://saref.etsi.org/saref4envi/> .
 
 <https://saref.etsi.org/saref4envi/> rdf:type owl:Ontology ;
@@ -74,12 +74,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
 #    Object Properties
 #################################################################
 
-###  http://www.w3.org/2003/01/geo/wgs84_pos#location
-geo:location rdf:type owl:ObjectProperty ;
-             rdfs:comment "The relation between something and the point,  or other geometrical thing in space, where it is.  For example, the realtionship between a radio tower and a Point with a given lat and long. Or a relationship between a park and its outline as a closed arc of points, or a road and its location as a arc (a sequence of points). Clearly in practice there will be limit to the accuracy of any such statement, but one would expect an accuracy appropriate for the size of the object and uses such as mapping ."@en ;
-             rdfs:isDefinedBy geo: ;
-             rdfs:label "location"@en .
-
 
 ###  https://saref.etsi.org/core/isMeasuredIn
 saref:isMeasuredIn rdf:type owl:ObjectProperty ;
@@ -338,28 +332,6 @@ saref:hasValue rdf:type owl:DatatypeProperty ;
 #    Classes
 #################################################################
 
-###  http://www.w3.org/2003/01/geo/wgs84_pos#Point
-geo:Point rdf:type owl:Class ;
-          rdfs:comment "A point, typically described using a coordinate system relative to Earth, such as WGS84. Uniquely identified by lat/long/alt. i.e. spaciallyIntersects(P1, P2) :- lat(P1, LAT), long(P1, LONG), alt(P1, ALT), at(P2, LAT), long(P2, LONG), alt(P2, ALT). sameThing(P1, P2) :- type(P1, Point), type(P2, Point), spaciallyIntersects(P1, P2)."@en ;
-          rdfs:isDefinedBy geo: ;
-          rdfs:label "Point"@en .
-
-
-###  http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing
-geo:SpatialThing rdf:type owl:Class ;
-                 owl:disjointWith saref:Measurement ,
-                                  saref:Service ,
-                                  :Color ,
-                                  :CommunicationInterface ,
-                                  :CommunicationProtocol ,
-                                  :CompassDirection ,
-                                  :DigitalRepresentation ,
-                                  :Geometry ;
-                 rdfs:comment "Anything with spatial extent, i.e. size, shape, or position. e.g. people, places, bowling balls, as well as abstract areas like cubes."@en ;
-                 rdfs:isDefinedBy geo: ;
-                 rdfs:label "Spatial thing"@en .
-
-
 ###  http://www.w3.org/2006/time#TemporalUnit
 time:TemporalUnit rdf:type owl:Class ;
                   rdfs:subClassOf saref:UnitOfMeasure ;
@@ -732,11 +704,7 @@ saref:UnitOfMeasure rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref4envi/LightPoint
 :LightPoint rdf:type owl:Class ;
-            rdfs:subClassOf geo:Point ,
-                            [ rdf:type owl:Restriction ;
-                              owl:onProperty geo:location ;
-                              owl:allValuesFrom geo:SpatialThing
-                            ] ,
+            rdfs:subClassOf saref:FeatureOfInterest , geo:Feature ,
                             [ rdf:type owl:Restriction ;
                               owl:onProperty :projectsLight ;
                               owl:allValuesFrom :Light
@@ -781,11 +749,7 @@ saref:UnitOfMeasure rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref4envi/PhysicalObject
 :PhysicalObject rdf:type owl:Class ;
-                rdfs:subClassOf geo:SpatialThing ,
-                                [ rdf:type owl:Restriction ;
-                                  owl:onProperty geo:location ;
-                                  owl:allValuesFrom geo:SpatialThing
-                                ] ,
+                rdfs:subClassOf saref:FeatureOfInterest , geo:Feature ,
                                 [ rdf:type owl:Restriction ;
                                   owl:onProperty :contains ;
                                   owl:allValuesFrom :PhysicalObject