diff --git a/ontology/saref4envi.ttl b/ontology/saref4envi.ttl
index ac5452f290de2c193f767e9bbc1359d1d0c6ecc0..ac958b94e3d4c3d6d84cd60eba86c0d1794c14e1 100644
--- a/ontology/saref4envi.ttl
+++ b/ontology/saref4envi.ttl
@@ -89,14 +89,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
           rdfs:label "has color"@en .
 
 
-###  https://saref.etsi.org/saref4envi/hasComponent
-:hasComponent rdf:type owl:ObjectProperty ;
-              owl:inverseOf :isComponentOf ;
-              rdf:type owl:TransitiveProperty ;
-              rdfs:comment "A relation between a system and the system in which it might be decomposed."@en ;
-              rdfs:label "has component"@en .
-
-
 ###  https://saref.etsi.org/saref4envi/hasDigitalRepresentation
 :hasDigitalRepresentation rdf:type owl:ObjectProperty ,
                                    owl:InverseFunctionalProperty ;
@@ -142,13 +134,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
                rdfs:label "is component of"@en .
 
 
-###  https://saref.etsi.org/saref4envi/isConnectedTo
-:isConnectedTo rdf:type owl:ObjectProperty ,
-                        owl:SymmetricProperty ;
-               rdfs:comment "A relation between a system and the system to which it is connected."@en ;
-               rdfs:label "is connected to"@en .
-
-
 ###  https://saref.etsi.org/saref4envi/isProjectedFromHeight
 :isProjectedFromHeight rdf:type owl:ObjectProperty ;
                        rdfs:comment "A relation between a light and the height measurement from which it is projected."@en ;
@@ -317,7 +302,7 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
 :DigitalRepresentation rdf:type owl:Class ;
                        rdfs:subClassOf [ rdf:type owl:Restriction ;
                                          owl:onProperty :encapsulates ;
-                                         owl:allValuesFrom :PhysicalObject
+                                         owl:allValuesFrom [ a owl:Class ; owl:intersectionOf ( saref:FeatureOfInterest geo:Feature ) ]
                                        ] ,
                                        [ rdf:type owl:Restriction ;
                                          owl:onProperty :isAccesibleThrough ;
@@ -502,40 +487,9 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
             rdfs:label "Photometer"@en .
 
 
-###  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
-                                ] ,
-                                [ rdf:type owl:Restriction ;
-                                  owl:onProperty :hasDigitalRepresentation ;
-                                  owl:allValuesFrom :DigitalRepresentation
-                                ] ,
-                                [ rdf:type owl:Restriction ;
-                                  owl:onProperty saref:hasDescription ;
-                                  owl:allValuesFrom xsd:string
-                                ] ;
-                rdfs:comment "Any Object that has a proper space region.  (Definition extracted from DUL ontology)"@en ;
-                rdfs:label "Physical object"@en .
-
-
 ###  https://saref.etsi.org/saref4envi/System
 :System rdf:type owl:Class ;
-        rdfs:subClassOf :PhysicalObject ,
-                        [ rdf:type owl:Restriction ;
-                          owl:onProperty :hasComponent ;
-                          owl:allValuesFrom :System
-                        ] ,
-                        [ rdf:type owl:Restriction ;
-                          owl:onProperty :isComponentOf ;
-                          owl:allValuesFrom :System
-                        ] ,
-                        [ rdf:type owl:Restriction ;
-                          owl:onProperty :isConnectedTo ;
-                          owl:allValuesFrom :System
-                        ] ,
+        rdfs:subClassOf saref:FeatureOfInterest , geo:Feature ,
                         [ rdf:type owl:Restriction ;
                           owl:onProperty :usesCommunicationInterface ;
                           owl:allValuesFrom :CommunicationInterface