diff --git a/ontology/saref4auto.ttl b/ontology/saref4auto.ttl
index 97647cd3e34f5626e98104a94e4639b82a88ad07..79420dac28cb3b4012dbc40a6034c711c45ae8c7 100644
--- a/ontology/saref4auto.ttl
+++ b/ontology/saref4auto.ttl
@@ -83,13 +83,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
   rdfs:label "has Environment"@en .
 
 
-###  https://saref.etsi.org/saref4auto/hasOpeningTimeAvailability
-:hasOpeningTimeAvailability rdf:type owl:ObjectProperty ;
-  rdfs:range time:TemporalEntity ;
-  rdfs:comment "A relation to express the opening time of parking spot"@en ;
-  rdfs:label "hasOpeningTimeAvailability"@en .
-
-
 ###  https://saref.etsi.org/saref4auto/hasPlatoonRole
 :hasPlatoonRole rdf:type owl:ObjectProperty ;
   rdfs:subPropertyOf :hasRole ;
@@ -141,13 +134,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
                   rdfs:label "AutomotiveObject"@en .
 
 
-###  https://saref.etsi.org/saref4auto/ElectricChargingParkingSpot
-:ElectricChargingParkingSpot rdf:type owl:Class ;
-                             rdfs:subClassOf :ParkingSpot ;
-                             rdfs:comment "A type pf parking spot"@en ;
-                             rdfs:label "ElectricChargingParkingSpot"@en .
-
-
 ###  https://saref.etsi.org/saref4auto/ElectronicControlUnit
 :ElectronicControlUnit rdf:type owl:Class ;
                        rdfs:subClassOf saref:Device ,
@@ -187,38 +173,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
                rdfs:label "NotifiedEvent"@en .
 
 
-###  https://saref.etsi.org/saref4auto/ParkingSpot
-:ParkingSpot rdf:type owl:Class ;
-             rdfs:subClassOf saref:FeatureOfInterest, geo:Feature ,
-                             [ rdf:type owl:Restriction ;
-                               owl:onProperty saref:hasProperty ;
-                               owl:hasValue :Height
-                             ] ,
-                             [ rdf:type owl:Restriction ;
-                               owl:onProperty saref:hasIdentifier ;
-                               owl:minCardinality 1
-                             ] ,
-                             [ rdf:type owl:Restriction ;
-                               owl:onProperty saref:hasProperty ;
-                               owl:hasValue :Length
-                             ] ,
-                             [ rdf:type owl:Restriction ;
-                               owl:onProperty :hasOpeningTimeAvailability ;
-                               owl:someValuesFrom time:TemporalEntity
-                             ] ,
-                             [ rdf:type owl:Restriction ;
-                               owl:onProperty :hasWidth ;
-                               owl:hasValue :Width
-                             ] ,
-                             [ rdf:type owl:Restriction ;
-                               owl:onProperty saref:hasState ;
-                               owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-                               owl:onClass :ParkingSpotState
-                             ] ;
-             rdfs:comment "A location that is designated for parking. A parking spot is a geo:Feature and can thus have a geometry."@en ;
-             rdfs:label "ParkingSpot"@en .
-
-
 ###  https://saref.etsi.org/saref4auto/PersonalDevice
 :PersonalDevice rdf:type owl:Class ;
                 rdfs:subClassOf saref:Device ,
@@ -272,13 +226,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
              rdfs:label "PlatoonRole"@en .
 
 
-###  https://saref.etsi.org/saref4auto/RegularParkingSpot
-:RegularParkingSpot rdf:type owl:Class ;
-                    rdfs:subClassOf :ParkingSpot ;
-                    rdfs:comment "A type pf parking spot"@en ;
-                    rdfs:label "RegularParkingSpot"@en .
-
-
 ###  https://saref.etsi.org/saref4auto/RoadEntity
 :RoadEntity rdf:type owl:Class ;
             rdfs:subClassOf saref:FeatureOfInterest ,
@@ -412,13 +359,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
        rdfs:label "Route"@en .
 
 
-###  https://saref.etsi.org/saref4auto/SpecialPermitParkingSpot
-:SpecialPermitParkingSpot rdf:type owl:Class ;
-                          rdfs:subClassOf :ParkingSpot ;
-                          rdfs:comment "A type pf parking spot. Parking spot reserved for special permits (authorities, disabled, blue Zone, resident ...)"@en ;
-                          rdfs:label "SpecialPermitParkingSpot"@en .
-
-
 ###  https://saref.etsi.org/saref4auto/TrafficLightController
 :TrafficLightController rdf:type owl:Class ;
                         rdfs:subClassOf :RoadSideActuator ;
@@ -873,6 +813,10 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
   rdfs:comment "The shape of an entity: i.e., Sphere, Torus, Cylinder, Cone, Ellipsoid, Cube, Cuboid, Pyramid, Prism, Multiple shapes"@en ;
   rdfs:label "Shape"@en .
 
+:OpeningTimeAvailability rdf:type owl:ObjectProperty ;
+  rdfs:comment "The opening time of a parking spot."@en ;
+  rdfs:label "has opening time availability"@en .
+
 ### SAREF patterns for states: Categorizing states for the automotive domain
 
 :AutomotiveState a owl:Class ;
@@ -880,6 +824,31 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
     rdfs:label "Automotive State"@en ;
     rdfs:comment "Class of states related to the automotive domain."@en .
 
+
+### SAREF patterns for feature kinds: for parking spots
+
+:ParkingSpot rdf:type saref:FeatureKind ;
+  saref:hasProperty :Height , :Length , :Width , :OpeningTimeAvailability ;
+  saref:hasState :ParkingSpotState ;
+  rdfs:comment "A location that is designated for parking. A parking spot is a geo:Feature and can thus have a geometry."@en ;
+  rdfs:label "ParkingSpot"@en .
+
+:ElectricChargingParkingSpot rdf:type saref:FeatureKind ;
+  skos:broader :ParkingSpot ;
+  rdfs:comment "A type pf parking spot"@en ;
+  rdfs:label "ElectricChargingParkingSpot"@en .
+
+:RegularParkingSpot rdf:type saref:FeatureKind ;
+  skos:broader :ParkingSpot ;
+  rdfs:comment "A type pf parking spot"@en ;
+  rdfs:label "RegularParkingSpot"@en .
+
+:SpecialPermitParkingSpot rdf:type saref:FeatureKind ;
+  skos:broader :ParkingSpot ;
+  rdfs:comment "A type pf parking spot. Parking spot reserved for special permits (authorities, disabled, blue Zone, resident ...)"@en ;
+  rdfs:label "SpecialPermitParkingSpot"@en .
+
+
 ### SAREF patterns for states: for parking spots
 
 :ParkingSpotState rdf:type owl:Class ;