diff --git a/ontology/saref4auto.ttl b/ontology/saref4auto.ttl
index 7c6a70ba8afb11a8c69d539074765b6f0cb399db..71bfe815e99635023da6549e378c157cfd4868f9 100644
--- a/ontology/saref4auto.ttl
+++ b/ontology/saref4auto.ttl
@@ -1,148 +1,225 @@
 @prefix : <https://saref.etsi.org/saref4auto/> .
 @prefix dc: <http://purl.org/dc/elements/1.1/> .
-@prefix dcterms: <http://purl.org/dc/terms/> .
+@prefix sf: <http://www.opengis.net/ont/sf#> .
 @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> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix time: <http://www.w3.org/2006/time#> .
+@prefix vann: <http://purl.org/vocab/vann/> .
+@prefix geosp: <http://www.opengis.net/ont/geosparql#> .
 @prefix saref: <https://saref.etsi.org/core/> .
 @prefix s4city: <https://saref.etsi.org/saref4city/> .
-@prefix vann: <http://purl.org/vocab/vann/> .
 @prefix s4syst: <https://saref.etsi.org/saref4syst/> .
-@prefix time: <http://www.w3.org/2006/time#> .
-@prefix geosp: <http://www.opengis.net/ont/geosparql#> .
-@prefix sf: <http://www.opengis.net/ont/sf#> .
-@prefix s4auto: <https://saref.etsi.org/saref4auto/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
 @base <https://saref.etsi.org/saref4auto> .
 
+<https://saref.etsi.org/saref4auto> rdf:type owl:Ontology ;
+                                     dcterms:description "This ontology extends the SAREF ontology for the automotive domain. This work has been developed in the context of the STF 566, which was established with the goal to create four SAREF extensions, one of them for the automotive domain."@en ;
+                                     dcterms:license <https://forge.etsi.org/etsi-software-license> ;
+                                     dcterms:publisher <https://www.etsi.org/> ;
+                                     dcterms:source <https://forge.etsi.org/rep/SAREF/saref4auto/> ;
+                                     dcterms:title "SAREF extension for automotive"@en ;
+                                     vann:preferredNamespacePrefix "s4auto" ;
+                                     vann:preferredNamespaceUri "https://saref.etsi.org/saref4auto/" ;
+                                     owl:versionInfo "1.0" .
+
+#################################################################
+#    Annotation properties
+#################################################################
+
+###  http://purl.org/dc/terms/description
+dcterms:description rdf:type owl:AnnotationProperty .
+
+
+###  http://purl.org/dc/terms/license
+dcterms:license rdf:type owl:AnnotationProperty .
+
+
+###  http://purl.org/dc/terms/publisher
+dcterms:publisher rdf:type owl:AnnotationProperty .
+
+
+###  http://purl.org/dc/terms/source
+dcterms:source rdf:type owl:AnnotationProperty .
+
+
+###  http://purl.org/dc/terms/title
+dcterms:title rdf:type owl:AnnotationProperty .
+
+
+###  http://purl.org/vocab/vann/preferredNamespacePrefix
+vann:preferredNamespacePrefix rdf:type owl:AnnotationProperty .
+
+
+###  http://purl.org/vocab/vann/preferredNamespaceUri
+vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
 
-<https://saref.etsi.org/saref4auto> rdf:type owl:Ontology .
 
 #################################################################
 #    Object Properties
 #################################################################
 
 ###  http://www.opengis.net/ont/geosparql#hasGeometry
-<http://www.opengis.net/ont/geosparql#hasGeometry> rdf:type owl:ObjectProperty ;
-                                                   rdfs:subPropertyOf owl:topObjectProperty ;
-                                                   rdfs:domain <http://www.opengis.net/ont/geosparql#Feature> ;
-                                                   rdfs:range <http://www.opengis.net/ont/geosparql#Geometry> .
+geosp:hasGeometry rdf:type owl:ObjectProperty ;
+                  rdfs:domain geosp:Feature ;
+                  rdfs:range geosp:Geometry ;
+                  rdfs:comment "A spatial representation for a given feature." ;
+                  rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql> .
+
 
+###  http://www.w3.org/2003/01/geo/wgs84_pos#location
+<http://www.w3.org/2003/01/geo/wgs84_pos#location> rdf:type owl:ObjectProperty ;
+                                                   rdfs:range <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> ;
+                                                   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 .""" ;
+                                                   rdfs:isDefinedBy "http://www.w3.org/2003/01/geo/wgs84_pos#" .
 
-###  http://www.opengis.net/ont/geosparql#sfContains
-<http://www.opengis.net/ont/geosparql#sfContains> rdf:type owl:ObjectProperty ;
-                                                  rdfs:subPropertyOf owl:topObjectProperty .
 
+###  http://www.w3.org/2006/time#hasBeginning
+time:hasBeginning rdf:type owl:ObjectProperty ;
+                  rdfs:domain time:TemporalEntity ;
+                  rdfs:range time:Instant ;
+                  rdfs:comment "Beginning of a temporal entity" ;
+                  rdfs:isDefinedBy "http://www.w3.org/2006/time" .
 
-###  http://www.w3.org/2002/07/owl#topObjectProperty
-owl:topObjectProperty rdfs:range <https://saref.etsi.org/core/State> .
 
+###  http://www.w3.org/2006/time#hasEnd
+time:hasEnd rdf:type owl:ObjectProperty ;
+            rdfs:domain time:TemporalEntity ;
+            rdfs:range time:Instant ;
+            rdfs:comment "End of a temporal entity." ;
+            rdfs:isDefinedBy "http://www.w3.org/2006/time" .
 
-###  http://www.w3.org/2003/01/geo/wgs84_pos#location
-<http://www.w3.org/2003/01/geo/wgs84_pos#location> rdf:type owl:ObjectProperty ;
-                                                   rdfs:subPropertyOf owl:topObjectProperty ;
-                                                   rdfs:domain <http://www.opengis.net/ont/geosparql#SpatialThing> ;
-                                                   rdfs:range [ rdf:type owl:Restriction ;
-                                                                owl:onProperty <http://www.w3.org/2003/01/geo/wgs84_pos#location> ;
-                                                                owl:someValuesFrom <http://www.w3.org/2003/01/geo/wgs84_pos#Point>
-                                                              ] .
 
+###  https://saref.etsi.org/core/consistsOf
+saref:consistsOf rdf:type owl:ObjectProperty .
 
-###  https://saref.etsi.org/core/hasState
-<https://saref.etsi.org/core/hasState> rdf:type owl:ObjectProperty ;
-                                        rdfs:subPropertyOf owl:topObjectProperty ;
-                                        rdfs:domain <https://saref.etsi.org/core/Device> .
+
+###  https://saref.etsi.org/core/hasConfidenceUnitOfMeasure
+saref:hasConfidenceUnitOfMeasure rdf:type owl:ObjectProperty .
 
 
 ###  https://saref.etsi.org/core/makesMeasurement
-<https://saref.etsi.org/core/makesMeasurement> rdf:type owl:ObjectProperty ;
-                                                rdfs:subPropertyOf owl:topObjectProperty ;
-                                                owl:inverseOf <https://saref.etsi.org/core/measurementMadeBy> ;
-                                                rdfs:label "makesMeasurement"@en .
+saref:makesMeasurement rdf:type owl:ObjectProperty ;
+                       owl:inverseOf saref:measurementMadeBy ;
+                       rdfs:label "makesMeasurement"@en .
 
 
 ###  https://saref.etsi.org/core/measurementMadeBy
-<https://saref.etsi.org/core/measurementMadeBy> rdf:type owl:ObjectProperty ;
-                                                 rdfs:subPropertyOf owl:topObjectProperty ;
-                                                 rdfs:label "measurementMadeBy"@en .
+saref:measurementMadeBy rdf:type owl:ObjectProperty ;
+                        rdfs:label "measurementMadeBy"@en .
 
 
 ###  https://saref.etsi.org/core/measuresProperty
-<https://saref.etsi.org/core/measuresProperty> rdf:type owl:ObjectProperty ;
-                                                rdfs:subPropertyOf owl:topObjectProperty ;
-                                                rdfs:domain <https://saref.etsi.org/core/Device> ;
-                                                rdfs:range <https://saref.etsi.org/core/Property> .
+saref:measuresProperty rdf:type owl:ObjectProperty ;
+                       rdfs:domain saref:Device ;
+                       rdfs:range saref:Property .
 
 
-###  https://saref.etsi.org/saref4auto/hasShape
-:hasShape rdf:type owl:ObjectProperty .
+###  https://saref.etsi.org/saref4auto/consistsOfEntity
+:consistsOfEntity rdf:type owl:ObjectProperty ;
+                  rdfs:subPropertyOf saref:consistsOf .
 
 
-###  https://saref.etsi.org/saref4auto/hasMovement
-:hasMovement rdf:type owl:ObjectProperty .
+###  https://saref.etsi.org/saref4auto/consistsOfEquipment
+:consistsOfEquipment rdf:type owl:ObjectProperty ;
+                     rdfs:subPropertyOf saref:consistsOf .
 
 
-###  https://saref.etsi.org/saref4auto/consistsOf
-:consistsOf rdf:type owl:ObjectProperty ;
-            rdfs:label "consistsOf"@en .
+###  https://saref.etsi.org/saref4auto/consistsOfEvent
+:consistsOfEvent rdf:type owl:ObjectProperty ;
+                 rdfs:subPropertyOf saref:consistsOf .
+
+
+###  https://saref.etsi.org/saref4auto/consistsOfObject
+:consistsOfObject rdf:type owl:ObjectProperty ;
+                  rdfs:subPropertyOf saref:consistsOf .
+
+
+###  https://saref.etsi.org/saref4auto/consistsOfUser
+:consistsOfUser rdf:type owl:ObjectProperty ;
+                rdfs:subPropertyOf saref:consistsOf .
+
+
+###  https://saref.etsi.org/saref4auto/consistsOfVehicle
+:consistsOfVehicle rdf:type owl:ObjectProperty ;
+                   rdfs:subPropertyOf saref:consistsOf .
 
 
 ###  https://saref.etsi.org/saref4auto/detectsPosition
-:detectsPosition rdf:type owl:ObjectProperty ;
-                 rdfs:subPropertyOf owl:topObjectProperty .
+:detectsPosition rdf:type owl:ObjectProperty .
+
+
+###  https://saref.etsi.org/saref4auto/hasAbsolutePosition
+:hasAbsolutePosition rdf:type owl:ObjectProperty ;
+                     rdfs:subPropertyOf :hasPosition .
 
 
 ###  https://saref.etsi.org/saref4auto/hasAutomationLevel
-:hasAutomationLevel rdf:type owl:ObjectProperty ;
-                    rdfs:subPropertyOf owl:topObjectProperty .
+:hasAutomationLevel rdf:type owl:ObjectProperty .
 
 
 ###  https://saref.etsi.org/saref4auto/hasBrakeCapacity
 :hasBrakeCapacity rdf:type owl:ObjectProperty ;
-                  rdfs:subPropertyOf owl:topObjectProperty ;
                   rdfs:range :BrakeCapacity .
 
 
+###  https://saref.etsi.org/saref4auto/hasConfidence
+:hasConfidence rdf:type owl:ObjectProperty ;
+               owl:inverseOf :isConfidenceOf ;
+               rdfs:range :Confidence .
+
+
 ###  https://saref.etsi.org/saref4auto/hasDestination
 :hasDestination rdf:type owl:ObjectProperty ;
-                rdfs:subPropertyOf owl:topObjectProperty ;
                 rdfs:comment "A relation that defines the destination of an automotive object. For example, in aplatoon, the current platoon leader defines the platoon destination. Following vehicles will share (partially) the route of the leader and can, therefore, have different final destinations." .
 
 
+###  https://saref.etsi.org/saref4auto/hasDestinationAddress
+:hasDestinationAddress rdf:type owl:ObjectProperty ;
+                       rdfs:subPropertyOf :hasDestination .
+
+
+###  https://saref.etsi.org/saref4auto/hasDestinationEndPoint
+:hasDestinationEndPoint rdf:type owl:ObjectProperty ;
+                        rdfs:subPropertyOf :hasDestination .
+
+
+###  https://saref.etsi.org/saref4auto/hasEnvironment
+:hasEnvironment rdf:type owl:ObjectProperty .
+
+
 ###  https://saref.etsi.org/saref4auto/hasEstimatedRendezvousLocation
 :hasEstimatedRendezvousLocation rdf:type owl:ObjectProperty ;
-                                rdfs:subPropertyOf owl:topObjectProperty ;
                                 rdfs:range :RendezvousLocation ;
                                 rdfs:comment "A relation to express that, during the forming state, a vehicle member of a platoon is given an estimated rendezvous location for joining" .
 
 
 ###  https://saref.etsi.org/saref4auto/hasHeight
-:hasHeight rdf:type owl:ObjectProperty ;
-           rdfs:subPropertyOf owl:topObjectProperty .
+:hasHeight rdf:type owl:ObjectProperty .
 
 
 ###  https://saref.etsi.org/saref4auto/hasIdentifier
 :hasIdentifier rdf:type owl:ObjectProperty ;
-               rdfs:subPropertyOf owl:topObjectProperty ;
-               rdfs:range <https://saref.etsi.org/saref4auto/Identifier> ;
+               rdfs:range :Identifier ;
                rdfs:comment "relation between an entity and its identifier"@en ;
                rdfs:label "hasIdentifier"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/hasLength
-:hasLength rdf:type owl:ObjectProperty ;
-           rdfs:subPropertyOf owl:topObjectProperty .
-
-
-###  https://saref.etsi.org/saref4auto/hasMaxSize
-:hasMaxSize rdf:type owl:ObjectProperty ;
-            rdfs:comment "A relation to express that a platoon can have a maximum size, namely the maximum number of vehicles allowed to join the platoon due to safety requirements" .
+:hasLength rdf:type owl:ObjectProperty .
 
 
 ###  https://saref.etsi.org/saref4auto/hasMember
 :hasMember rdf:type owl:ObjectProperty ;
-           rdfs:subPropertyOf owl:topObjectProperty ;
+           owl:inverseOf :isMemberOf ;
            rdfs:label "hasMember"@en .
 
 
@@ -156,25 +233,73 @@ owl:topObjectProperty rdfs:range <https://saref.etsi.org/core/State> .
 
 
 ###  https://saref.etsi.org/saref4auto/hasOrigin
-:hasOrigin rdf:type owl:ObjectProperty ;
-           rdfs:subPropertyOf owl:topObjectProperty .
+:hasOrigin rdf:type owl:ObjectProperty .
+
+
+###  https://saref.etsi.org/saref4auto/hasParkingSpotState
+:hasParkingSpotState rdf:type owl:ObjectProperty ;
+                     rdfs:subPropertyOf :hasState .
+
+
+###  https://saref.etsi.org/saref4auto/hasParkingVehicleState
+:hasParkingVehicleState rdf:type owl:ObjectProperty ;
+                        rdfs:subPropertyOf :hasState .
+
+
+###  https://saref.etsi.org/saref4auto/hasPerceptionState
+:hasPerceptionState rdf:type owl:ObjectProperty ;
+                    rdfs:subPropertyOf :hasState .
+
+
+###  https://saref.etsi.org/saref4auto/hasPlatoonMember
+:hasPlatoonMember rdf:type owl:ObjectProperty ;
+                  rdfs:subPropertyOf :hasMember .
+
+
+###  https://saref.etsi.org/saref4auto/hasPlatoonPosition
+:hasPlatoonPosition rdf:type owl:ObjectProperty ;
+                    rdfs:subPropertyOf :hasPosition .
+
+
+###  https://saref.etsi.org/saref4auto/hasPlatoonRole
+:hasPlatoonRole rdf:type owl:ObjectProperty ;
+                rdfs:subPropertyOf :hasRole .
+
+
+###  https://saref.etsi.org/saref4auto/hasPlatoonState
+:hasPlatoonState rdf:type owl:ObjectProperty ;
+                 rdfs:subPropertyOf :hasState .
+
+
+###  https://saref.etsi.org/saref4auto/hasPlatoonVehicleState
+:hasPlatoonVehicleState rdf:type owl:ObjectProperty ;
+                        rdfs:subPropertyOf :hasState .
 
 
 ###  https://saref.etsi.org/saref4auto/hasPosition
 :hasPosition rdf:type owl:ObjectProperty ;
-             rdfs:subPropertyOf owl:topObjectProperty ;
-             rdfs:range <https://saref.etsi.org/saref4auto/RelativePosition> .
+             rdfs:range :RelativePosition .
+
+
+###  https://saref.etsi.org/saref4auto/hasRelativePosition
+:hasRelativePosition rdf:type owl:ObjectProperty ;
+                     rdfs:subPropertyOf :hasPosition .
+
+
+###  https://saref.etsi.org/saref4auto/hasRoadTopologyPosition
+:hasRoadTopologyPosition rdf:type owl:ObjectProperty ;
+                         rdfs:subPropertyOf :hasPosition .
 
 
 ###  https://saref.etsi.org/saref4auto/hasRole
 :hasRole rdf:type owl:ObjectProperty ;
-         rdfs:subPropertyOf owl:topObjectProperty ;
-         rdfs:range <https://saref.etsi.org/saref4auto/Role> .
+         rdfs:range :Role ;
+		 rdfs:comment "The role the vehicle plays in traffic. Possible values are: publicTransport, specialTransport, dangerousGoods, roadWork, rescue, emergency, safetyCar, agriculture, commercial, military, roadOperator, taxi."@en ;
+         rdfs:label "hasRole"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/hasRoute
-:hasRoute rdf:type owl:ObjectProperty ;
-          rdfs:subPropertyOf owl:topObjectProperty .
+:hasRoute rdf:type owl:ObjectProperty .
 
 
 ###  https://saref.etsi.org/saref4auto/hasShape
@@ -183,34 +308,49 @@ owl:topObjectProperty rdfs:range <https://saref.etsi.org/core/State> .
 
 
 ###  https://saref.etsi.org/saref4auto/hasSize
-:hasSize rdf:type owl:ObjectProperty ;
-         rdfs:subPropertyOf owl:topObjectProperty .
+:hasSize rdf:type owl:ObjectProperty .
+
+
+###  https://saref.etsi.org/saref4auto/hasState
+:hasState rdf:type owl:ObjectProperty ;
+          rdfs:comment "An hasState relation to connect to a certain state. The saref:hasState property could not be reused because it has domain saref:Device and a s4auto:Platoon or s4auto:Vehicle are not devices. Therefore, a new s4auto:hasState property with subroperties has been created." .
+
+
+###  https://saref.etsi.org/saref4auto/hasVehicleEnvironmentMember
+:hasVehicleEnvironmentMember rdf:type owl:ObjectProperty ;
+                             rdfs:subPropertyOf :hasMember .
+
+
+###  https://saref.etsi.org/saref4auto/hasVehicleRole
+:hasVehicleRole rdf:type owl:ObjectProperty ;
+                rdfs:subPropertyOf :hasRole .
 
 
 ###  https://saref.etsi.org/saref4auto/hasWidth
-:hasWidth rdf:type owl:ObjectProperty ;
-          rdfs:subPropertyOf owl:topObjectProperty .
+:hasWidth rdf:type owl:ObjectProperty .
 
 
 ###  https://saref.etsi.org/saref4auto/isCollectionOf
-:isCollectionOf rdf:type owl:ObjectProperty ;
-                rdfs:subPropertyOf owl:topObjectProperty .
+:isCollectionOf rdf:type owl:ObjectProperty .
 
 
-###  https://saref.etsi.org/saref4auto/isMeasuredIn
-:isMeasuredIn rdf:type owl:ObjectProperty .
+###  https://saref.etsi.org/saref4auto/isConfidenceOf
+:isConfidenceOf rdf:type owl:ObjectProperty .
 
 
 ###  https://saref.etsi.org/saref4auto/isMemberOf
 :isMemberOf rdf:type owl:ObjectProperty ;
-            rdfs:subPropertyOf owl:topObjectProperty ;
             rdfs:label "isMemberOf"@en .
 
 
-###  https://saref.etsi.org/saref4auto/isPartOf
-:isPartOf rdf:type owl:ObjectProperty ;
-          rdfs:domain <https://saref.etsi.org/saref4auto/Vehicle> ;
-          rdfs:label "isPartOf"@en .
+###  https://saref.etsi.org/saref4auto/isMemberOfPlatoon
+:isMemberOfPlatoon rdf:type owl:ObjectProperty ;
+                   rdfs:subPropertyOf :isMemberOf .
+
+
+###  https://saref.etsi.org/saref4auto/isMemberOfVehicleEnvironment
+:isMemberOfVehicleEnvironment rdf:type owl:ObjectProperty ;
+                              rdfs:subPropertyOf :isMemberOf .
 
 
 ###  https://saref.etsi.org/saref4auto/usesMeasurement
@@ -218,45 +358,73 @@ owl:topObjectProperty rdfs:range <https://saref.etsi.org/core/State> .
 
 
 ###  https://saref.etsi.org/saref4syst/hasSubSystem
-<https://saref.etsi.org/saref4syst/hasSubSystem> rdf:type owl:ObjectProperty ;
-                                                 rdfs:subPropertyOf owl:topObjectProperty ;
-                                                 owl:inverseOf <https://saref.etsi.org/saref4syst/subSystemOf> .
+s4syst:hasSubSystem rdf:type owl:ObjectProperty ;
+                    owl:inverseOf s4syst:subSystemOf .
 
 
 ###  https://saref.etsi.org/saref4syst/subSystemOf
-<https://saref.etsi.org/saref4syst/subSystemOf> rdf:type owl:ObjectProperty ;
-                                                rdfs:subPropertyOf owl:topObjectProperty .
+s4syst:subSystemOf rdf:type owl:ObjectProperty .
 
 
-###  https://saref.etsi.org/saref4auto/hasConfidence
-<https://saref.etsi.org/saref4auto/hasConfidence> rdf:type owl:ObjectProperty ;
-                                                 rdfs:subPropertyOf owl:topObjectProperty ;
-                                                 owl:inverseOf <https://saref.etsi.org/saref4auto/isConfidenceOf> ;
-                                                 rdfs:range <https://saref.etsi.org/saref4auto/Confidence> .
+#################################################################
+#    Data properties
+#################################################################
 
+###  http://www.w3.org/2003/01/geo/wgs84_pos#alt
+<http://www.w3.org/2003/01/geo/wgs84_pos#alt> rdf:type owl:DatatypeProperty ;
+                                              rdfs:domain <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> ;
+                                              rdfs:comment """The WGS84 altitude of a SpatialThing (decimal meters 
+above the local reference ellipsoid).""" ;
+                                              rdfs:isDefinedBy "http://www.w3.org/2003/01/geo/wgs84_pos" ;
+                                              rdfs:label "altitude" .
 
-###  https://saref.etsi.org/saref4auto/isConfidenceOf
-<https://saref.etsi.org/saref4auto/isConfidenceOf> rdf:type owl:ObjectProperty ;
-                                                  rdfs:subPropertyOf owl:topObjectProperty .
 
+###  http://www.w3.org/2003/01/geo/wgs84_pos#lat
+<http://www.w3.org/2003/01/geo/wgs84_pos#lat> rdf:type owl:DatatypeProperty ;
+                                              rdfs:domain <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> ;
+                                              rdfs:comment "The WGS84 latitude of a SpatialThing (decimal degrees)." ;
+                                              rdfs:isDefinedBy "http://www.w3.org/2003/01/geo/wgs84_pos" ;
+                                              rdfs:label "latitude" .
 
-#################################################################
-#    Data properties
-#################################################################
 
-###  https://etsi.saref.org/core/hasTimestamp
-<https://etsi.saref.org/core/hasTimestamp> rdf:type owl:DatatypeProperty ;
-                                            rdfs:subPropertyOf owl:topDataProperty .
+###  http://www.w3.org/2003/01/geo/wgs84_pos#long
+<http://www.w3.org/2003/01/geo/wgs84_pos#long> rdf:type owl:DatatypeProperty ;
+                                               rdfs:domain <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> ;
+                                               rdfs:comment "The WGS84 longitude of a SpatialThing (decimal degrees)." ;
+                                               rdfs:isDefinedBy "http://www.w3.org/2003/01/geo/wgs84_pos" ;
+                                               rdfs:label "longitude" .
+
+
+###  http://www.w3.org/2006/time#inXSDDateTimeStamp
+time:inXSDDateTimeStamp rdf:type owl:DatatypeProperty ;
+                        rdfs:domain time:Instant ;
+                        rdfs:range xsd:dateTimeStamp ;
+                        rdfs:comment "Position of an instant, expressed using xsd:dateTimeStamp" ;
+                        rdfs:isDefinedBy "http://www.w3.org/2006/time" .
+
+
+###  https://saref.etsi.org/core/hasTimestamp
+saref:hasTimestamp rdf:type owl:DatatypeProperty .
 
 
 ###  https://saref.etsi.org/core/hasValue
-<https://saref.etsi.org/core/hasValue> rdf:type owl:DatatypeProperty ;
-                                        rdfs:subPropertyOf owl:topDataProperty .
+saref:hasValue rdf:type owl:DatatypeProperty .
 
 
 ###  https://saref.etsi.org/saref4auto/hasConfidenceValue
-:hasConfidenceValue rdf:type owl:DatatypeProperty ;
-                         rdfs:subPropertyOf owl:topDataProperty .
+:hasConfidenceValue rdf:type owl:DatatypeProperty .
+
+
+###  https://saref.etsi.org/saref4auto/hasCoordinateX
+:hasCoordinateX rdf:type owl:DatatypeProperty .
+
+
+###  https://saref.etsi.org/saref4auto/hasCoordinateY
+:hasCoordinateY rdf:type owl:DatatypeProperty .
+
+
+###  https://saref.etsi.org/saref4auto/hasCoordinateZ
+:hasCoordinateZ rdf:type owl:DatatypeProperty .
 
 
 ###  https://saref.etsi.org/saref4auto/hasDescriptionName
@@ -271,201 +439,224 @@ owl:topObjectProperty rdfs:range <https://saref.etsi.org/core/State> .
 
 ###  https://saref.etsi.org/saref4auto/hasIDValue
 :hasIDValue rdf:type owl:DatatypeProperty ;
-            rdfs:subPropertyOf owl:topDataProperty ;
             rdfs:label "saref:hasIDValue"@en .
 
 
+###  https://saref.etsi.org/saref4auto/hasMaxSize
+:hasMaxSize rdf:type owl:DatatypeProperty ;
+            rdfs:comment "The masx size a platoon a certain platoon can have. Nore that it is defined as a datatype property as this is a fixed/static value of the platoon that does not change over time. In contrast, the current size of the platoon is actually a measurement that may change over time and it is therefore defined as an object property." .
+
+
 ###  https://saref.etsi.org/saref4auto/hasPlatoonIndex
 :hasPlatoonIndex rdf:type owl:DatatypeProperty ;
-                 rdfs:subPropertyOf owl:topDataProperty ;
                  rdfs:range xsd:int .
 
 
-###  https://saref.etsi.org/saref4auto/hasRole
-:hasRole rdf:type owl:DatatypeProperty ;
-         rdfs:subPropertyOf owl:topDataProperty .
-
-
-###  https://saref.etsi.org/saref4auto/hasTimestamp
-:hasTimestamp rdf:type owl:DatatypeProperty ;
-              rdfs:subPropertyOf owl:topDataProperty ;
-              rdfs:range xsd:dateTime .
-
-
-###  https://saref.etsi.org/saref4auto/hasCoordinateX
-<https://saref.etsi.org/saref4auto/hasCoordinateX> rdf:type owl:DatatypeProperty ;
-                                                  rdfs:subPropertyOf owl:topDataProperty .
-
-
-###  https://saref.etsi.org/saref4auto/hasCoordinateY
-<https://saref.etsi.org/saref4auto/hasCoordinateY> rdf:type owl:DatatypeProperty ;
-                                                  rdfs:subPropertyOf owl:topDataProperty .
-
-
-###  https://saref.etsi.org/saref4auto/hasCoordinateZ
-<https://saref.etsi.org/saref4auto/hasCoordinateZ> rdf:type owl:DatatypeProperty ;
-                                                  rdfs:subPropertyOf owl:topDataProperty .
-
-
 #################################################################
 #    Classes
 #################################################################
 
-###  http://www.opengis.net/ont/geosparql#AbsolutePosition
-<http://www.opengis.net/ont/geosparql#AbsolutePosition> rdf:type owl:Class ;
-                                                        rdfs:subClassOf <http://www.w3.org/2003/01/geo/wgs84_pos#Point> ,
-                                                                        :Position ;
-                                                        rdfs:label """AbsolutePosition
-"""@en .
-
-
 ###  http://www.opengis.net/ont/geosparql#Feature
-<http://www.opengis.net/ont/geosparql#Feature> rdf:type owl:Class ;
-                                               rdfs:subClassOf <http://www.opengis.net/ont/geosparql#SpatialThing> ,
-                                                               [ rdf:type owl:Restriction ;
-                                                                 owl:onProperty <http://www.opengis.net/ont/geosparql#hasGeometry> ;
-                                                                 owl:someValuesFrom <http://www.opengis.net/ont/geosparql#Geometry>
-                                                               ] ;
-                                               rdfs:label "Feature"@en .
+geosp:Feature rdf:type owl:Class ;
+              rdfs:subClassOf geosp:SpatialObject ;
+              owl:disjointWith geosp:Geometry ;
+              rdfs:comment """This class represents the top-level feature type. This class is 
+      equivalent to GFI_Feature defined in ISO 19156:2011, and it is 
+      superclass of all feature types.""" ;
+              rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql> ;
+              rdfs:label "Feature"@en .
 
 
 ###  http://www.opengis.net/ont/geosparql#Geometry
-<http://www.opengis.net/ont/geosparql#Geometry> rdf:type owl:Class ;
-                                                rdfs:subClassOf <http://www.opengis.net/ont/geosparql#SpatialThing> ;
-                                                rdfs:label "Geometry"@en .
+geosp:Geometry rdf:type owl:Class ;
+               rdfs:subClassOf geosp:SpatialObject ;
+               rdfs:comment """The class represents the top-level geometry type. This class is 
+      equivalent to the UML class GM_Object defined in ISO 19107, and 
+      it is superclass of all geometry types.""" ;
+               rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql> ;
+               rdfs:label "Geometry"@en .
 
 
-###  http://www.opengis.net/ont/geosparql#SpatialThing
-<http://www.opengis.net/ont/geosparql#SpatialThing> rdf:type owl:Class ;
-                                                    rdfs:label "SpatialObject"@en .
+###  http://www.opengis.net/ont/geosparql#SpatialObject
+geosp:SpatialObject rdf:type owl:Class ;
+                    rdfs:comment """The class spatial-object represents everything that can have 
+      a spatial representation. It is superclass of feature and geometry.""" ;
+                    rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql> ;
+                    rdfs:label "SpatialObject"@en .
 
 
 ###  http://www.w3.org/2003/01/geo/wgs84_pos#Point
 <http://www.w3.org/2003/01/geo/wgs84_pos#Point> rdf:type owl:Class ;
-                                                rdfs:subClassOf <http://www.opengis.net/ont/geosparql#Geometry> ;
+                                                rdfs:subClassOf <http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> ;
+                                                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),
+  lat(P2, LAT), long(P2, LONG), alt(P2, ALT).
+
+sameThing(P1, P2) :- type(P1, Point), type(P2, Point), spaciallyIntersects(P1, P2).""" ;
+                                                rdfs:isDefinedBy "http://www.w3.org/2003/01/geo/wgs84_pos#" ;
                                                 rdfs:label "Point"@en .
 
 
+###  http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing
+<http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing> rdf:type owl:Class ;
+                                                       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.""" ;
+                                                       rdfs:isDefinedBy "http://www.w3.org/2003/01/geo/wgs84_pos#" ;
+                                                       rdfs:label "Spatial Thing"@en .
+
+
 ###  http://www.w3.org/2006/time#Instant
-<http://www.w3.org/2006/time#Instant> rdf:type owl:Class ;
-                                      rdfs:subClassOf <http://www.w3.org/2006/time#TemporalEntity> ;
-                                      rdfs:label "Instant"@en .
+time:Instant rdf:type owl:Class ;
+             rdfs:subClassOf time:TemporalEntity ;
+             rdfs:comment "A temporal entity with zero extent or duration" ;
+             rdfs:isDefinedBy "http://www.w3.org/2006/time" ;
+             rdfs:label "Instant"@en .
 
 
 ###  http://www.w3.org/2006/time#Interval
-<http://www.w3.org/2006/time#Interval> rdf:type owl:Class ;
-                                       rdfs:subClassOf <http://www.w3.org/2006/time#TemporalEntity> ;
-                                       rdfs:label "Interval"@en .
+time:Interval rdf:type owl:Class ;
+              rdfs:subClassOf time:TemporalEntity ;
+              rdfs:comment "A temporal entity with an extent or duration" ;
+              rdfs:isDefinedBy "http://www.w3.org/2006/time" ;
+              rdfs:label "Interval"@en .
 
 
 ###  http://www.w3.org/2006/time#TemporalEntity
-<http://www.w3.org/2006/time#TemporalEntity> rdf:type owl:Class ;
-                                             rdfs:label "TemporaryEntity"@en .
+time:TemporalEntity rdf:type owl:Class ;
+                    rdfs:comment "A temporal interval or instant." ;
+                    rdfs:isDefinedBy "http://www.w3.org/2006/time" ;
+                    rdfs:label "TemporaryEntity"@en .
 
 
 ###  https://saref.etsi.org/core/Actuator
-<https://saref.etsi.org/core/Actuator> rdf:type owl:Class ;
-                                        rdfs:subClassOf <https://saref.etsi.org/core/Device> ;
-                                        rdfs:label "Actuator"@en .
+saref:Actuator rdf:type owl:Class ;
+               rdfs:subClassOf saref:Device ;
+               rdfs:label "Actuator"@en .
 
 
 ###  https://saref.etsi.org/core/Device
-<https://saref.etsi.org/core/Device> rdf:type owl:Class ;
-                                      rdfs:subClassOf [ rdf:type owl:Restriction ;
-                                                        owl:onProperty <https://saref.etsi.org/core/makesMeasurement> ;
-                                                        owl:someValuesFrom <https://saref.etsi.org/core/Measurement>
-                                                      ] ;
-                                      rdfs:label "Device"@en .
+saref:Device rdf:type owl:Class ;
+             rdfs:label "Device"@en .
 
 
 ###  https://saref.etsi.org/core/FeatureOfInterest
-<https://saref.etsi.org/core/FeatureOfInterest> rdf:type owl:Class ;
-                                                 rdfs:subClassOf [ rdf:type owl:Restriction ;
-                                                                   owl:onProperty :hasIdentifier ;
-                                                                   owl:someValuesFrom <https://saref.etsi.org/saref4auto/Identifier>
-                                                                 ] ;
-                                                 rdfs:label "FeatureOfInterest"@en .
+saref:FeatureOfInterest rdf:type owl:Class ;
+                        rdfs:subClassOf [ rdf:type owl:Restriction ;
+                                          owl:onProperty :hasIdentifier ;
+                                          owl:someValuesFrom :Identifier
+                                        ] ;
+                        rdfs:label "FeatureOfInterest"@en .
 
 
 ###  https://saref.etsi.org/core/Measurement
-<https://saref.etsi.org/core/Measurement> rdf:type owl:Class ;
-                                           rdfs:subClassOf [ rdf:type owl:Restriction ;
-                                                             owl:onProperty <https://saref.etsi.org/core/measurementMadeBy> ;
-                                                             owl:someValuesFrom <https://saref.etsi.org/core/Device>
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty <https://saref.etsi.org/saref4auto/hasConfidence> ;
-                                                             owl:someValuesFrom <https://saref.etsi.org/saref4auto/Confidence>
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty <https://etsi.saref.org/core/hasTimestamp> ;
-                                                             owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-                                                             owl:onDataRange xsd:dateTime
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty <https://saref.etsi.org/core/hasValue> ;
-                                                             owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-                                                             owl:onDataRange xsd:nonNegativeInteger
-                                                           ] ;
-                                           rdfs:label "Measurement"@en .
+saref:Measurement rdf:type owl:Class ;
+                  rdfs:subClassOf [ rdf:type owl:Restriction ;
+                                    owl:onProperty saref:measurementMadeBy ;
+                                    owl:someValuesFrom saref:Device
+                                  ] ,
+                                  [ rdf:type owl:Restriction ;
+                                    owl:onProperty :hasConfidence ;
+                                    owl:someValuesFrom :Confidence
+                                  ] ;
+                  rdfs:label "Measurement"@en .
 
 
 ###  https://saref.etsi.org/core/Property
-<https://saref.etsi.org/core/Property> rdf:type owl:Class ;
-                                        rdfs:label "Property"@en .
+saref:Property rdf:type owl:Class ;
+               rdfs:label "Property"@en .
 
 
 ###  https://saref.etsi.org/core/Sensor
-<https://saref.etsi.org/core/Sensor> rdf:type owl:Class ;
-                                      rdfs:subClassOf <https://saref.etsi.org/core/Device> ;
-                                      rdfs:label "Sensor"@en .
+saref:Sensor rdf:type owl:Class ;
+             rdfs:subClassOf saref:Device ;
+             rdfs:label "Sensor"@en .
 
 
 ###  https://saref.etsi.org/core/State
-<https://saref.etsi.org/core/State> rdf:type owl:Class ;
-                                     rdfs:label "State"@en .
+saref:State rdf:type owl:Class ;
+            rdfs:label "State"@en .
 
 
 ###  https://saref.etsi.org/core/UnitOfMeasure
-<https://saref.etsi.org/core/UnitOfMeasure> rdf:type owl:Class ;
-                                             rdfs:label "UnitOfMeasure"@en .
+saref:UnitOfMeasure rdf:type owl:Class ;
+                    rdfs:label "UnitOfMeasure"@en .
+
+
+###  https://saref.etsi.org/saref4auto/AbsolutePosition
+:AbsolutePosition rdf:type owl:Class ;
+                  rdfs:subClassOf :Point ,
+                                  :Position ,
+                                  [ rdf:type owl:Restriction ;
+                                    owl:onProperty <http://www.w3.org/2003/01/geo/wgs84_pos#alt> ;
+                                    owl:someValuesFrom xsd:float
+                                  ] ,
+                                  [ rdf:type owl:Restriction ;
+                                    owl:onProperty <http://www.w3.org/2003/01/geo/wgs84_pos#lat> ;
+                                    owl:someValuesFrom xsd:float
+                                  ] ,
+                                  [ rdf:type owl:Restriction ;
+                                    owl:onProperty <http://www.w3.org/2003/01/geo/wgs84_pos#long> ;
+                                    owl:someValuesFrom xsd:float
+                                  ] ;
+                  rdfs:comment "The absolute poistion of an automotive object in terms of lat, long and lat"@en ;
+                  rdfs:label "AbsolutePosition"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/AbsoluteSpeed
 :AbsoluteSpeed rdf:type owl:Class ;
                rdfs:subClassOf :Speed ;
+               rdfs:comment "A type of speed"@en ;
                rdfs:label "AbsoluteSpeed"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/Acceleration
 :Acceleration rdf:type owl:Class ;
-              rdfs:subClassOf <https://saref.etsi.org/core/Property> ;
+              rdfs:subClassOf saref:Property ;
+              rdfs:comment "A Property of interest for the automotive domain"@en ;
               rdfs:label "Acceleration"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/AccelerationConfidence
 :AccelerationConfidence rdf:type owl:Class ;
-                        rdfs:subClassOf <https://saref.etsi.org/saref4auto/Confidence> ,
+                        rdfs:subClassOf :Confidence ,
                                         [ rdf:type owl:Restriction ;
-                                          owl:onProperty <https://saref.etsi.org/saref4auto/hasConfidenceValue> ;
-                                          owl:someValuesFrom xsd:int
+                                          owl:onProperty :hasConfidenceValue ;
+                                          owl:someValuesFrom xsd:float
                                         ] ;
-                        rdfs:comment "absolute accuracy of a reported vehicle acceleration value with a predefined confidence level (e.g. 95 %)"^^xsd:string ;
-                        rdfs:label "AccelerationConfidence" .
+                        rdfs:comment "absolute accuracy of a reported vehicle acceleration value with a predefined confidence level (e.g. 95 %)"@en ;
+                        rdfs:label "AccelerationConfidence"@en .
 
 
-###  https://saref.etsi.org/saref4auto/Adress
-:Adress rdf:type owl:Class ;
-        rdfs:comment "A class to define common information related to an address. "@en ;
-        rdfs:label "Adress"@en .
+###  https://saref.etsi.org/saref4auto/Address
+:Address rdf:type owl:Class ;
+         rdfs:comment "A class to define common information related to an address. "@en ;
+         rdfs:label "Address"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/AngularDirection
 :AngularDirection rdf:type owl:Class ;
                   rdfs:subClassOf :Heading ;
+                  rdfs:comment "A type of heading"@en ;
                   rdfs:label "AngularDirection"@en .
 
 
+###  https://saref.etsi.org/saref4auto/Assembling
+:Assembling rdf:type owl:Class ;
+            rdfs:subClassOf :PlatoonState .
+
+
+###  https://saref.etsi.org/saref4auto/AtDropOffSpot
+:AtDropOffSpot rdf:type owl:Class ;
+               rdfs:subClassOf :ParkingVehicleState .
+
+
+###  https://saref.etsi.org/saref4auto/AtPickUpSpot
+:AtPickUpSpot rdf:type owl:Class ;
+              rdfs:subClassOf :ParkingVehicleState .
+
+
 ###  https://saref.etsi.org/saref4auto/AutomationLevel
 :AutomationLevel rdf:type owl:Class ;
                  rdfs:comment "The level of automation a platoon of vehicles or a singular vehicle"@en ;
@@ -480,56 +671,295 @@ owl:topObjectProperty rdfs:range <https://saref.etsi.org/core/State> .
 
 ###  https://saref.etsi.org/saref4auto/BrakeCapacity
 :BrakeCapacity rdf:type owl:Class ;
-               rdfs:subClassOf <https://saref.etsi.org/core/Property> ;
+               rdfs:subClassOf saref:Property ;
+               rdfs:comment "A Property of interest for the automotive domain"@en ;
                rdfs:label "BrakeCapacity"@en .
 
 
+###  https://saref.etsi.org/saref4auto/Bus
+:Bus rdf:type owl:Class ;
+     rdfs:subClassOf :PublicTransport ;
+     rdfs:comment "A type of public transport"@en ;
+     rdfs:label "Bus"@en .
+
+
+###  https://saref.etsi.org/saref4auto/Car
+:Car rdf:type owl:Class ;
+     rdfs:subClassOf :Vehicle ;
+     rdfs:comment "A type of vehicle"@en ;
+     rdfs:label "Car"@en .
+
+
+###  https://saref.etsi.org/saref4auto/Charging
+:Charging rdf:type owl:Class ;
+          rdfs:subClassOf :ParkingSpotState ,
+                          :ParkingVehicleState .
+
+
+###  https://saref.etsi.org/saref4auto/Closed
+:Closed rdf:type owl:Class ;
+        rdfs:subClassOf :ParkingSpotState .
+
+
+###  https://saref.etsi.org/saref4auto/Confidence
+:Confidence rdf:type owl:Class ;
+            rdfs:subClassOf [ rdf:type owl:Restriction ;
+                              owl:onProperty saref:hasConfidenceUnitOfMeasure ;
+                              owl:someValuesFrom saref:UnitOfMeasure
+                            ] ,
+                            [ rdf:type owl:Restriction ;
+                              owl:onProperty :hasConfidenceValue ;
+                              owl:someValuesFrom xsd:float
+                            ] ;
+            rdfs:comment "Every measurement in the automotive domain is an estimated measurement coming from the aggregation of several mesurements from different sensor or devices taken at the same time or at consecutive times very close to each other. Therefore, a confidence is always associated to each mesurement to indicate that it has not 100% accuracy."@en ;
+            rdfs:label "Confidence"@en .
+
+
+###  https://saref.etsi.org/saref4auto/CriticalObject
+:CriticalObject rdf:type owl:Class ;
+                rdfs:subClassOf owl:Thing ,
+                                [ rdf:type owl:Restriction ;
+                                  owl:onProperty :hasHeight ;
+                                  owl:someValuesFrom :Height
+                                ] ,
+                                [ rdf:type owl:Restriction ;
+                                  owl:onProperty :hasLength ;
+                                  owl:someValuesFrom :Length
+                                ] ,
+                                [ rdf:type owl:Restriction ;
+                                  owl:onProperty :hasMovement ;
+                                  owl:someValuesFrom :Movement
+                                ] ,
+                                [ rdf:type owl:Restriction ;
+                                  owl:onProperty :hasShape ;
+                                  owl:someValuesFrom :Shape
+                                ] ,
+                                [ rdf:type owl:Restriction ;
+                                  owl:onProperty :hasWidth ;
+                                  owl:someValuesFrom :Width
+                                ] ;
+                rdfs:comment "critical objects are small object, medium object, large object"@en ;
+                rdfs:label "CriticalObject"@en .
+
+
+###  https://saref.etsi.org/saref4auto/Disengaging
+:Disengaging rdf:type owl:Class ;
+             rdfs:subClassOf :PlatoonState ,
+                             :PlatoonVehicleState .
+
+
+###  https://saref.etsi.org/saref4auto/DrivingToParkingSpot
+:DrivingToParkingSpot rdf:type owl:Class ;
+                      rdfs:subClassOf :ParkingVehicleState .
+
+
+###  https://saref.etsi.org/saref4auto/DrivingToPickUpSpot
+:DrivingToPickUpSpot rdf:type owl:Class ;
+                     rdfs:subClassOf :ParkingVehicleState .
+
+
 ###  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 ,
+                                       s4syst:System ,
+                                       [ rdf:type owl:Restriction ;
+                                         owl:onProperty saref:measuresProperty ;
+                                         owl:someValuesFrom :Acceleration
+                                       ] ,
+                                       [ rdf:type owl:Restriction ;
+                                         owl:onProperty saref:measuresProperty ;
+                                         owl:someValuesFrom :Heading
+                                       ] ,
+                                       [ rdf:type owl:Restriction ;
+                                         owl:onProperty saref:measuresProperty ;
+                                         owl:someValuesFrom :Position
+                                       ] ,
+                                       [ rdf:type owl:Restriction ;
+                                         owl:onProperty saref:measuresProperty ;
+                                         owl:someValuesFrom :Speed
+                                       ] ,
+                                       [ rdf:type owl:Restriction ;
+                                         owl:onProperty :usesMeasurement ;
+                                         owl:someValuesFrom saref:Measurement
+                                       ] ,
+                                       [ rdf:type owl:Restriction ;
+                                         owl:onProperty s4syst:subSystemOf ;
+                                         owl:someValuesFrom :Vehicle
+                                       ] ;
+                       rdfs:comment "An electronic control unit (ECU) is any embedded system in automotive electronics that monitors and controls one or more of the electrical systems or subsystems in a vehicle."@en ;
+                       rdfs:label "ElectronicControlUnit"@en .
+
+
 ###  https://saref.etsi.org/saref4auto/EndPoint
 :EndPoint rdf:type owl:Class ;
-          rdfs:subClassOf <http://www.w3.org/2003/01/geo/wgs84_pos#Point> ;
+          rdfs:subClassOf :Point ;
+          rdfs:comment "The final destination of a vehicle or a platoon, or the final point of a route"@en ;
           rdfs:label "EndPoint"@en .
 
 
+###  https://saref.etsi.org/saref4auto/Engaging
+:Engaging rdf:type owl:Class ;
+          rdfs:subClassOf :PlatoonVehicleState .
+
+
+###  https://saref.etsi.org/saref4auto/Forming
+:Forming rdf:type owl:Class ;
+         rdfs:subClassOf :PlatoonVehicleState .
+
+
+###  https://saref.etsi.org/saref4auto/Free
+:Free rdf:type owl:Class ;
+      rdfs:subClassOf :ParkingSpotState .
+
+
 ###  https://saref.etsi.org/saref4auto/Heading
 :Heading rdf:type owl:Class ;
-         rdfs:subClassOf <https://saref.etsi.org/core/Property> ;
+         rdfs:subClassOf saref:Property ;
          rdfs:label "Heading"@en .
 
 
+###  https://saref.etsi.org/saref4auto/HeavyTruck
+:HeavyTruck rdf:type owl:Class ;
+            rdfs:subClassOf :Truck ;
+            rdfs:comment "A type of truck"@en ;
+            rdfs:label "HeavyTruck"@en .
+
+
 ###  https://saref.etsi.org/saref4auto/Height
 :Height rdf:type owl:Class ;
-        rdfs:subClassOf <https://saref.etsi.org/core/Property> ;
+        rdfs:subClassOf saref:Property ;
+        rdfs:comment "A Property of interest for the automotive domain"@en ;
         rdfs:label "Height"@en .
 
 
+###  https://saref.etsi.org/saref4auto/HeightUnit
+:HeightUnit rdf:type owl:Class ;
+            rdfs:subClassOf saref:UnitOfMeasure .
+
+
+###  https://saref.etsi.org/saref4auto/Identifier
+:Identifier rdf:type owl:Class ;
+            rdfs:subClassOf [ rdf:type owl:Restriction ;
+                              owl:onProperty :hasIDValue ;
+                              owl:someValuesFrom xsd:string
+                            ] ;
+            rdfs:comment "A class used to identify 1)  a vehicle (station) during data exchange with other devices/stations 2) a platoon during data exchange with other devices/stations, 3)  a parking spot within a parking area during data exchange with other devices/stations. In all cases, this identifier may be a pseudonym. It may change over space and/or over time."@en ;
+            rdfs:label "Identifier"@en .
+
+
+###  https://saref.etsi.org/saref4auto/LargeObject
+:LargeObject rdf:type owl:Class ;
+             rdfs:subClassOf :CriticalObject ;
+             rdfs:comment "A type of Critical Object"@en ;
+             rdfs:label "Large Object"@en .
+
+
 ###  https://saref.etsi.org/saref4auto/LateralAcceleration
 :LateralAcceleration rdf:type owl:Class ;
-                     rdfs:subClassOf :Acceleration .
+                     rdfs:subClassOf :Acceleration ;
+                     rdfs:comment "A type of acceleration"@en ;
+                     rdfs:label "Lateral Acceleration"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/Length
 :Length rdf:type owl:Class ;
-        rdfs:subClassOf <https://saref.etsi.org/core/Property> ;
+        rdfs:subClassOf saref:Property ;
+        rdfs:comment "A Property of interest for the automotive domain"@en ;
         rdfs:label "Length"@en .
 
 
+###  https://saref.etsi.org/saref4auto/LengthUnit
+:LengthUnit rdf:type owl:Class ;
+            rdfs:subClassOf saref:UnitOfMeasure .
+
+
+###  https://saref.etsi.org/saref4auto/LightTruck
+:LightTruck rdf:type owl:Class ;
+            rdfs:subClassOf :Truck ;
+            rdfs:comment "A type of truck"@en ;
+            rdfs:label "LightTruck"@en .
+
+
 ###  https://saref.etsi.org/saref4auto/LongitudinalAcceleration
 :LongitudinalAcceleration rdf:type owl:Class ;
-                          rdfs:subClassOf :Acceleration .
+                          rdfs:subClassOf :Acceleration ;
+                          rdfs:comment "A type of acceleration"@en ;
+                          rdfs:label "LongitudinalAcceleration"@en .
+
+
+###  https://saref.etsi.org/saref4auto/MediumObject
+:MediumObject rdf:type owl:Class ;
+              rdfs:subClassOf :CriticalObject ;
+              rdfs:comment "A type of Critical Object"@en ;
+              rdfs:label "Medium Object"@en .
+
+
+###  https://saref.etsi.org/saref4auto/Movement
+:Movement rdf:type owl:Class ;
+          rdfs:subClassOf saref:Property ;
+          rdfs:comment "A Property of interest for the automotive domain. Relevant types of movement are: Static (position only), moving in same direction (speed, acceleration), moving in reverse direction (speed acceleration), crossing (speed, acceleration, direction)"@en ;
+          rdfs:label "Movement"@en .
+
+
+###  https://saref.etsi.org/saref4auto/NotifiedEvent
+:NotifiedEvent rdf:type owl:Class ;
+               rdfs:subClassOf owl:Thing ;
+               rdfs:comment "The relevant types of events are trafficCondition, accident, roadworks, impassability, adverseWeatherCondition-Adhesion, aquaplannning, hazardousLocation-SurfaceCondition, hazardousLocation-ObstacleOnTheRoad, hazardousLocation-AnimalOnTheRoad, humanPresenceOnTheRoad, wrongWayDriving, rescueAndRecoveryWorkInProgress, adverseWeatherCondition-ExtremeWeatherCondition, adverseWeatherCondition-Visibility, adverseWeatherCondition-Precipitation, slowVehicle, dangerousEndOfQueue, vehicleBreakdown, postCrash, humanProblem, stationaryVehicle, emergencyVehicleApproaching, hazardousLocation-DangerousCurve, collisionRisk, signalViolation, dangerousSituation"@en ;
+               rdfs:label "NotifiedEvent"@en .
+
+
+###  https://saref.etsi.org/saref4auto/Occupied
+:Occupied rdf:type owl:Class ;
+          rdfs:subClassOf :ParkingSpotState .
+
+
+###  https://saref.etsi.org/saref4auto/P1-Pedestrian
+:P1-Pedestrian rdf:type owl:Class ;
+               rdfs:subClassOf :VulnerableRoadUser ;
+               rdfs:comment "for example: adult, child, elderly person, pram, animal, blind person guided by a dog, rider off its bike"@en .
+
+
+###  https://saref.etsi.org/saref4auto/P2-Bicyclist
+:P2-Bicyclist rdf:type owl:Class ;
+              rdfs:subClassOf :VulnerableRoadUser ;
+              rdfs:comment "for example: user of bicycle, wheelchair, skater, scooter, Segway, or a mounted horse rider"@en .
+
+
+###  https://saref.etsi.org/saref4auto/P3-Motorcyclist
+:P3-Motorcyclist rdf:type owl:Class ;
+                 rdfs:subClassOf :VulnerableRoadUser ;
+                 rdfs:comment "Motorcyclists, which are equipped with engines that allow them to move on the road. It includes users (driver and passengers, e.g. children and animals) of Powered Two Wheelers (PTW) such as mopeds (motorized scooters), motorcycles or side-cars." .
+
+
+###  https://saref.etsi.org/saref4auto/P4-Animal
+:P4-Animal rdf:type owl:Class ;
+           rdfs:subClassOf :VulnerableRoadUser ;
+           rdfs:comment "animals presenting a safety risk to other road users, for example : dogs, wild animals, horses, cows, sheep, kangaroos, etc."@en .
+
+
+###  https://saref.etsi.org/saref4auto/Parked
+:Parked rdf:type owl:Class ;
+        rdfs:subClassOf :ParkingVehicleState .
+
+
+###  https://saref.etsi.org/saref4auto/Parking
+:Parking rdf:type owl:Class ;
+         rdfs:subClassOf :ParkingVehicleState .
 
 
 ###  https://saref.etsi.org/saref4auto/ParkingSpot
 :ParkingSpot rdf:type owl:Class ;
-             rdfs:subClassOf <http://www.opengis.net/ont/geosparql#Feature> ,
+             rdfs:subClassOf geosp:Feature ,
                              [ rdf:type owl:Restriction ;
-                               owl:onProperty <https://saref.etsi.org/core/hasState> ;
-                               owl:someValuesFrom :ParkingSpotState
+                               owl:onProperty geosp:hasGeometry ;
+                               owl:someValuesFrom :ParkingSpotPoint
                              ] ,
                              [ rdf:type owl:Restriction ;
                                owl:onProperty :hasHeight ;
@@ -537,7 +967,7 @@ owl:topObjectProperty rdfs:range <https://saref.etsi.org/core/State> .
                              ] ,
                              [ rdf:type owl:Restriction ;
                                owl:onProperty :hasIdentifier ;
-                               owl:someValuesFrom <https://saref.etsi.org/saref4auto/Identifier>
+                               owl:someValuesFrom :Identifier
                              ] ,
                              [ rdf:type owl:Restriction ;
                                owl:onProperty :hasLength ;
@@ -545,7 +975,11 @@ owl:topObjectProperty rdfs:range <https://saref.etsi.org/core/State> .
                              ] ,
                              [ rdf:type owl:Restriction ;
                                owl:onProperty :hasOpeningTimeAvailability ;
-                               owl:someValuesFrom <http://www.w3.org/2006/time#TemporalEntity>
+                               owl:someValuesFrom time:TemporalEntity
+                             ] ,
+                             [ rdf:type owl:Restriction ;
+                               owl:onProperty :hasParkingSpotState ;
+                               owl:someValuesFrom :ParkingSpotState
                              ] ,
                              [ rdf:type owl:Restriction ;
                                owl:onProperty :hasWidth ;
@@ -555,29 +989,88 @@ owl:topObjectProperty rdfs:range <https://saref.etsi.org/core/State> .
                                owl:onProperty :hasDescriptionName ;
                                owl:someValuesFrom xsd:string
                              ] ;
-             rdfs:comment "A location that is designated for parking. A parking spot has a geometry defining the parking area boundaries and its centre point" ;
+             rdfs:comment "A location that is designated for parking. A parking spot has a geometry defining the parking area boundaries and its centre point"@en ;
              rdfs:label "ParkingSpot"@en .
 
 
+###  https://saref.etsi.org/saref4auto/ParkingSpotPoint
+:ParkingSpotPoint rdf:type owl:Class ;
+                  rdfs:subClassOf :Point ;
+                  rdfs:comment "the position of aparking spot (its centre point) in terms of lat, long and alt"@en ;
+                  rdfs:label "ParkingSpotPoint"@en .
+
+
 ###  https://saref.etsi.org/saref4auto/ParkingSpotState
 :ParkingSpotState rdf:type owl:Class ;
-                  rdfs:subClassOf <https://saref.etsi.org/core/State> ;
-                  rdfs:comment "A parking spot has a state. Possible values for parking spot state are Free, occupied, reserved, closed, charging" ;
+                  rdfs:subClassOf :State ;
+                  rdfs:comment "A parking spot has a state. Possible values for parking spot state are Free, occupied, reserved, closed, charging"@en ;
                   rdfs:label "ParkingSpotState"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/ParkingVehicleState
 :ParkingVehicleState rdf:type owl:Class ;
-                     rdfs:subClassOf <https://saref.etsi.org/core/State> ;
-                     rdfs:comment "A vehicle can be found at different states (or parking phases) during parking . Possible values for parking state (or parking phase) of a vehicle are: At drop-off spot, at pick-up spot, driving to parking spot, driving to pick up spot, parking, parked, charging." ;
+                     rdfs:subClassOf :State ;
+                     rdfs:comment "A vehicle can be found at different states (or parking phases) during parking . Possible values for parking state (or parking phase) of a vehicle are: At drop-off spot, at pick-up spot, driving to parking spot, driving to pick up spot, parking, parked, charging."@en ;
                      rdfs:label "ParkingVehicleState"@en .
 
 
+###  https://saref.etsi.org/saref4auto/PassengerCar
+:PassengerCar rdf:type owl:Class ;
+              rdfs:subClassOf :Car ;
+              rdfs:comment "A type of car"@en ;
+              rdfs:label "PassengerCar"@en .
+
+
+###  https://saref.etsi.org/saref4auto/PerceptionState
+:PerceptionState rdf:type owl:Class ;
+                 rdfs:subClassOf :State .
+
+
+###  https://saref.etsi.org/saref4auto/PersonalDevice
+:PersonalDevice rdf:type owl:Class ;
+                rdfs:subClassOf saref:Device ,
+                                :AutomotiveObject ;
+                rdfs:label "PersonalDevice"@en .
+
+
+###  https://saref.etsi.org/saref4auto/Platoon
+:Platoon rdf:type owl:Class ;
+         rdfs:subClassOf [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasDestinationEndPoint ;
+                           owl:someValuesFrom :EndPoint
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasIdentifier ;
+                           owl:someValuesFrom :Identifier
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasMember ;
+                           owl:someValuesFrom :Vehicle
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasPlatoonState ;
+                           owl:someValuesFrom :PlatoonState
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasRoute ;
+                           owl:someValuesFrom :Route
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasSize ;
+                           owl:someValuesFrom :Size
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasMaxSize ;
+                           owl:someValuesFrom xsd:int
+                         ] ;
+         rdfs:comment "A group of vehicles automatically following each other at a relatively close distance" ;
+         rdfs:label "Platoon"@en .
+
+
 ###  https://saref.etsi.org/saref4auto/PlatoonAutomationLevel
 :PlatoonAutomationLevel rdf:type owl:Class ;
                         rdfs:subClassOf :AutomationLevel ;
-                        rdfs:comment """A vehicle has a level of automation for platooning. defined? 
-For example, in the ENSEMBLE project  there are three levels of automation for platooning being defined: Level A, Level B, Level C. Level C represents the highest level of automation for platooning in terms of longitudinal and lateral control, shortest time gap supported, wider range of situations handled and support for merging of entire platoons.""" ;
+                        rdfs:comment "A level of automation is defined for a vehicle that it is platooning. For example, in the ENSEMBLE project  there are three levels of platoon automation defined: Level A, Level B, Level C. Level C represents the highest level of automation for platooning in terms of longitudinal and lateral control, shortest time gap supported, wider range of situations handled and support for merging of entire platoons."@en ;
                         rdfs:label "PlatoonAutomationLevel"@en .
 
 
@@ -586,171 +1079,199 @@ For example, in the ENSEMBLE project  there are three levels of automation for p
                  rdfs:subClassOf :Position ,
                                  [ rdf:type owl:Restriction ;
                                    owl:onProperty :hasPlatoonIndex ;
-                                   owl:someValuesFrom xsd:dateTime
+                                   owl:someValuesFrom xsd:int
                                  ] ;
-                 rdfs:comment "A vehicle member of a platoon has a platoon position that is defined as the index of the vehicle in the platoon starting from zero (leader) up to N (trailing vehicle)." ;
+                 rdfs:comment "A vehicle member of a platoon has a platoon position that is defined as the index of the vehicle in the platoon starting from zero (leader) up to N (trailing vehicle)."@en ;
                  rdfs:label "PlatoonPosition"@en .
 
 
+###  https://saref.etsi.org/saref4auto/PlatoonRole
+:PlatoonRole rdf:type owl:Class ;
+             rdfs:subClassOf :Role ;
+             rdfs:comment "In platoon a vehicle can assume roles such as: unknown, leader, follower, ready-for-leading, trailing, etc."@en ;
+             rdfs:label "PlatoonRole"@en .
+
+
 ###  https://saref.etsi.org/saref4auto/PlatoonState
 :PlatoonState rdf:type owl:Class ;
-              rdfs:subClassOf <https://saref.etsi.org/core/State> ,
-                              [ rdf:type owl:Restriction ;
-                                owl:onProperty :hasTimestamp ;
-                                owl:someValuesFrom xsd:dateTime
-                              ] ;
-              rdfs:comment "Examples of states for a platoon are: unknown, standalone, assembling, platooning, disengaging, etc." ;
+              rdfs:subClassOf :State ;
+              rdfs:comment "Examples of states for a platoon are: unknown, standalone, assembling, platooning, disengaging, etc."@en ;
               rdfs:label "PlatoonState"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/PlatoonVehicleState
 :PlatoonVehicleState rdf:type owl:Class ;
-                     rdfs:subClassOf <https://saref.etsi.org/core/State> ,
-                                     [ rdf:type owl:Restriction ;
-                                       owl:onProperty :hasTimestamp ;
-                                       owl:someValuesFrom xsd:dateTime
-                                     ] ;
-                     rdfs:comment "Examples of states for a vehicle in a platoon are: unknown, standalone, engaging, platooning, disengaging, searching, forming." ;
+                     rdfs:subClassOf :State ;
+                     rdfs:comment "Examples of states for a vehicle in a platoon are: unknown, standalone, engaging, platooning, disengaging, searching, forming."@en ;
                      rdfs:label "PlatoonVehicleState"@en .
 
 
+###  https://saref.etsi.org/saref4auto/Platooning
+:Platooning rdf:type owl:Class ;
+            rdfs:subClassOf :PlatoonState ,
+                            :PlatoonVehicleState .
+
+
+###  https://saref.etsi.org/saref4auto/Point
+:Point rdf:type owl:Class ;
+       rdfs:subClassOf geosp:Geometry ,
+                       <http://www.w3.org/2003/01/geo/wgs84_pos#Point> ;
+       rdfs:comment "A geo point in SAREF4AUTO"@en ;
+       rdfs:label "Point"@en .
+
+
 ###  https://saref.etsi.org/saref4auto/Position
 :Position rdf:type owl:Class ;
-          rdfs:subClassOf <https://saref.etsi.org/core/Property> ,
-                          [ rdf:type owl:Restriction ;
-                            owl:onProperty <https://saref.etsi.org/saref4auto/hasConfidence> ;
-                            owl:someValuesFrom <https://saref.etsi.org/saref4auto/Confidence>
+          rdfs:subClassOf [ rdf:type owl:Restriction ;
+                            owl:onProperty :hasConfidence ;
+                            owl:someValuesFrom :Confidence
                           ] ;
+          rdfs:comment "The position of an entity in the automotive domain"@en ;
           rdfs:label "Position"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/PositionConfidenceEllipse
 :PositionConfidenceEllipse rdf:type owl:Class ;
-                           rdfs:subClassOf <https://saref.etsi.org/saref4auto/Confidence> ;
-                           rdfs:comment "horizontal position accuracy in a shape of ellipse with a predefined confidence level (e.g. 95 %). The centre of the ellipse shape corresponds to the reference position point for which the position accuracy is evaluated"^^xsd:string ;
-                           rdfs:label "PositionConfidenceEllipse" .
+                           rdfs:subClassOf :Confidence ;
+                           rdfs:comment "horizontal position accuracy in a shape of ellipse with a predefined confidence level (e.g. 95 %). The centre of the ellipse shape corresponds to the reference position point for which the position accuracy is evaluated"@en ;
+                           rdfs:label "PositionConfidenceEllipse"@en .
+
+
+###  https://saref.etsi.org/saref4auto/PublicTransport
+:PublicTransport rdf:type owl:Class ;
+                 rdfs:subClassOf :Vehicle ;
+                 rdfs:comment "A type of vehicle"@en ;
+                 rdfs:label "PublicTransport"@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/RelativePosition
+:RelativePosition rdf:type owl:Class ;
+                  rdfs:subClassOf :Position ,
+                                  [ rdf:type owl:Restriction ;
+                                    owl:onProperty :hasCoordinateX ;
+                                    owl:someValuesFrom xsd:float
+                                  ] ,
+                                  [ rdf:type owl:Restriction ;
+                                    owl:onProperty :hasCoordinateY ;
+                                    owl:someValuesFrom xsd:float
+                                  ] ,
+                                  [ rdf:type owl:Restriction ;
+                                    owl:onProperty :hasCoordinateZ ;
+                                    owl:someValuesFrom xsd:float
+                                  ] ;
+                  rdfs:comment "It represents the relative position of a vehicle (e.g., a car is x,y,z in front of another car)"@en ;
+                  rdfs:label "RelativePosition"@en .
+
+
 ###  https://saref.etsi.org/saref4auto/RelativeSpeed
 :RelativeSpeed rdf:type owl:Class ;
                rdfs:subClassOf :Speed ;
+               rdfs:comment "A type of speed"@en ;
                rdfs:label "RelativeSpeed"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/RendezvousLocation
 :RendezvousLocation rdf:type owl:Class ;
-                    rdfs:subClassOf <http://www.w3.org/2003/01/geo/wgs84_pos#Point> ;
-                    rdfs:comment "It is the estimated location where the vehicle member joins the platoon. It is expressed in global coordinates (lat, long, alt), e.g. according to WGS 84." ;
+                    rdfs:subClassOf :Point ;
+                    rdfs:comment "It is the estimated location where the vehicle member joins the platoon. It is expressed in global coordinates (lat, long, alt), e.g. according to WGS 84."@en ;
                     rdfs:label "RendezvousLocation"@en .
 
 
+###  https://saref.etsi.org/saref4auto/Reserved
+:Reserved rdf:type owl:Class ;
+          rdfs:subClassOf :ParkingSpotState .
+
+
 ###  https://saref.etsi.org/saref4auto/RoadEntity
 :RoadEntity rdf:type owl:Class ;
             rdfs:subClassOf [ rdf:type owl:Restriction ;
-                              owl:onProperty :RCHFHDeXziCQ60ytoZWbPrS ;
-                              owl:someValuesFrom :Shape
+                              owl:onProperty :consistsOfEquipment ;
+                              owl:someValuesFrom :RoadSideEquipment
                             ] ,
                             [ rdf:type owl:Restriction ;
-                              owl:onProperty :RDPi0RzXwTRRRRzugSeTSzz ;
-                              owl:someValuesFrom <https://saref.etsi.org/saref4auto/Movement>
+                              owl:onProperty :consistsOfEvent ;
+                              owl:someValuesFrom :NotifiedEvent
                             ] ,
                             [ rdf:type owl:Restriction ;
-                              owl:onProperty :consistsOf ;
-                              owl:someValuesFrom <https://saref.etsi.org/saref4auto/CriticalObject>
+                              owl:onProperty :consistsOfObject ;
+                              owl:someValuesFrom :CriticalObject
                             ] ,
                             [ rdf:type owl:Restriction ;
-                              owl:onProperty :consistsOf ;
-                              owl:someValuesFrom <https://saref.etsi.org/saref4auto/NotifiedEvent>
+                              owl:onProperty :consistsOfUser ;
+                              owl:someValuesFrom :VulnerableRoadUser
                             ] ,
                             [ rdf:type owl:Restriction ;
-                              owl:onProperty :consistsOf ;
-                              owl:someValuesFrom <https://saref.etsi.org/saref4auto/RoadSideEquipment>
+                              owl:onProperty :hasAbsolutePosition ;
+                              owl:someValuesFrom :AbsolutePosition
                             ] ,
                             [ rdf:type owl:Restriction ;
-                              owl:onProperty :consistsOf ;
-                              owl:someValuesFrom <https://saref.etsi.org/saref4auto/VulnerableRoadUser>
-                            ] ,
-                            [ rdf:type owl:Restriction ;
-                              owl:onProperty :hasHeight ;
-                              owl:someValuesFrom :Height
-                            ] ,
-                            [ rdf:type owl:Restriction ;
-                              owl:onProperty :hasLength ;
-                              owl:someValuesFrom :Length
-                            ] ,
-                            [ rdf:type owl:Restriction ;
-                              owl:onProperty :hasPosition ;
-                              owl:someValuesFrom <http://www.opengis.net/ont/geosparql#AbsolutePosition>
-                            ] ,
-                            [ rdf:type owl:Restriction ;
-                              owl:onProperty :hasPosition ;
-                              owl:someValuesFrom :RoadTopologyPosition
-                            ] ,
-                            [ rdf:type owl:Restriction ;
-                              owl:onProperty :hasPosition ;
-                              owl:someValuesFrom <https://saref.etsi.org/saref4auto/RelativePosition>
-                            ] ,
-                            [ rdf:type owl:Restriction ;
-                              owl:onProperty :hasWidth ;
-                              owl:someValuesFrom :Width
+                              owl:onProperty :hasRelativePosition ;
+                              owl:someValuesFrom :RelativePosition
                             ] ;
-            rdfs:comment "Entity present on the road in the neighbouring area of a vehicle"^^xsd:string ;
-            rdfs:label "RoadEntity" .
+            rdfs:comment "Entity present on the road in the neighbouring area of a vehicle"@en ;
+            rdfs:label "RoadEntity"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/RoadObject
 :RoadObject rdf:type owl:Class ;
-            rdfs:subClassOf <https://saref.etsi.org/core/FeatureOfInterest> ;
-            rdfs:comment "Road side sensors measure properties (such as speed, position, dimension, direction, etc.) of road objects. Types of relevant road objects are Pedestrian, vehicles, obstacles, traffic signs, etc." ;
+            rdfs:subClassOf saref:FeatureOfInterest ;
+            rdfs:comment "Road side sensors measure properties (such as speed, position, dimension, direction, etc.) of road objects. Types of relevant road objects are Pedestrian, vehicles, obstacles, traffic signs, etc."@en ;
             rdfs:label "RoadObject"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/RoadSideActuator
 :RoadSideActuator rdf:type owl:Class ;
-                  rdfs:subClassOf <https://saref.etsi.org/core/Actuator> ;
-                  rdfs:comment "Devices deployed along the road that produce signals based on road side sensor data measurements. Types of road side actuators that are relevant are devices such as traffic light controllers changing from red to green based on detected vehicles." ;
+                  rdfs:subClassOf saref:Actuator ;
+                  rdfs:comment "Devices deployed along the road that produce signals based on road side sensor data measurements. Types of road side actuators that are relevant are devices such as traffic light controllers changing from red to green based on detected vehicles."@en ;
                   rdfs:label """RoadSideActuator
 """@en .
 
 
+###  https://saref.etsi.org/saref4auto/RoadSideEquipment
+:RoadSideEquipment rdf:type owl:Class ;
+                   rdfs:subClassOf :AutomotiveObject ;
+                   rdfs:label "RoadSideEquipment"@en .
+
+
 ###  https://saref.etsi.org/saref4auto/RoadSideSensor
 :RoadSideSensor rdf:type owl:Class ;
-                rdfs:subClassOf <https://saref.etsi.org/core/Sensor> ,
+                rdfs:subClassOf saref:Sensor ,
                                 [ rdf:type owl:Restriction ;
-                                  owl:onProperty <https://saref.etsi.org/core/measuresProperty> ;
-                                  owl:someValuesFrom <http://www.opengis.net/ont/geosparql#AbsolutePosition>
+                                  owl:onProperty saref:measuresProperty ;
+                                  owl:someValuesFrom :AbsolutePosition
                                 ] ,
                                 [ rdf:type owl:Restriction ;
-                                  owl:onProperty <https://saref.etsi.org/core/measuresProperty> ;
+                                  owl:onProperty saref:measuresProperty ;
                                   owl:someValuesFrom :Heading
                                 ] ,
                                 [ rdf:type owl:Restriction ;
-                                  owl:onProperty <https://saref.etsi.org/core/measuresProperty> ;
+                                  owl:onProperty saref:measuresProperty ;
                                   owl:someValuesFrom :Height
                                 ] ,
                                 [ rdf:type owl:Restriction ;
-                                  owl:onProperty <https://saref.etsi.org/core/measuresProperty> ;
+                                  owl:onProperty saref:measuresProperty ;
                                   owl:someValuesFrom :Length
                                 ] ,
                                 [ rdf:type owl:Restriction ;
-                                  owl:onProperty <https://saref.etsi.org/core/measuresProperty> ;
-                                  owl:someValuesFrom :Speed
+                                  owl:onProperty saref:measuresProperty ;
+                                  owl:someValuesFrom :RelativePosition
                                 ] ,
                                 [ rdf:type owl:Restriction ;
-                                  owl:onProperty <https://saref.etsi.org/core/measuresProperty> ;
-                                  owl:someValuesFrom :Width
+                                  owl:onProperty saref:measuresProperty ;
+                                  owl:someValuesFrom :Speed
                                 ] ,
                                 [ rdf:type owl:Restriction ;
-                                  owl:onProperty <https://saref.etsi.org/core/measuresProperty> ;
-                                  owl:someValuesFrom <https://saref.etsi.org/saref4auto/RelativePosition>
+                                  owl:onProperty saref:measuresProperty ;
+                                  owl:someValuesFrom :Width
                                 ] ;
-                rdfs:comment "Sensors such as cameras, radars that are deployed along the road (e.g. at intersections and at poles along a highway)" ;
+                rdfs:comment "Sensors such as cameras, radars that are deployed along the road (e.g. at intersections and at poles along a highway)"@en ;
                 rdfs:label "RoadSideSensor"@en .
 
 
@@ -760,10 +1281,16 @@ For example, in the ENSEMBLE project  there are three levels of automation for p
                       rdfs:label "Road Topology Position"@en .
 
 
+###  https://saref.etsi.org/saref4auto/Role
+:Role rdf:type owl:Class ;
+      rdfs:comment "The role that can be assumed by a vehicle or a platoon"@en ;
+      rdfs:label "Role"@en .
+
+
 ###  https://saref.etsi.org/saref4auto/Route
 :Route rdf:type owl:Class ;
        rdfs:subClassOf [ rdf:type owl:Restriction ;
-                         owl:onProperty :hasDestination ;
+                         owl:onProperty :hasDestinationEndPoint ;
                          owl:someValuesFrom :EndPoint
                        ] ,
                        [ rdf:type owl:Restriction ;
@@ -774,663 +1301,467 @@ For example, in the ENSEMBLE project  there are three levels of automation for p
                          owl:onProperty :isCollectionOf ;
                          owl:someValuesFrom :RoutePoint
                        ] ;
-       rdfs:comment "The route of a platoon is defined as the route of the current vehicle leader in the platoon that other follower vehicles (partially) share" ;
-       rdfs:label "Route" .
+       rdfs:comment "The route of a vehicle or of a platoon. The route of a platoon is defined as the route of the current vehicle leader in the platoon that other follower vehicles (partially) share"@en ;
+       rdfs:label "Route"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/RoutePoint
 :RoutePoint rdf:type owl:Class ;
-            rdfs:subClassOf <http://www.w3.org/2003/01/geo/wgs84_pos#Point> ;
+            rdfs:subClassOf :Point ;
+            rdfs:comment "The intermediate points in a route"@en ;
             rdfs:label "RoutePoint"@en .
 
 
+###  https://saref.etsi.org/saref4auto/Searching
+:Searching rdf:type owl:Class ;
+           rdfs:subClassOf :PlatoonVehicleState .
+
+
 ###  https://saref.etsi.org/saref4auto/Shape
 :Shape rdf:type owl:Class ;
-       rdfs:subClassOf <https://saref.etsi.org/core/Property> ;
-       rdfs:comment "overall shape of an entity: Sphere, Torus, Cylinder, Cone, Ellipsoid, Cube, Cuboid, Pyramid, Prism, Multiple shapes"^^xsd:string ;
-       rdfs:label "Shape" .
+       rdfs:subClassOf saref:Property ;
+       rdfs:comment "A Property of interest for the automotive domain. Overall shape of an entity: Sphere, Torus, Cylinder, Cone, Ellipsoid, Cube, Cuboid, Pyramid, Prism, Multiple shapes"@en ;
+       rdfs:label "Shape"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/Size
 :Size rdf:type owl:Class ;
-      rdfs:comment "A platoon has a size. Tis size is defined as 1) the total number of vehicles currently in the platoon; or 2) Length of the platoon (sum of all vehicles' length + inter-vehicle distance)" ;
+      rdfs:subClassOf saref:Property ;
+      rdfs:comment "A Property of interest for the automotive domain. A platoon has a size. Tis size is defined as 1) the total number of vehicles currently in the platoon; or 2) Length of the platoon (sum of all vehicles' length + inter-vehicle distance)"@en ;
       rdfs:label "Size"@en .
 
 
+###  https://saref.etsi.org/saref4auto/SmallObject
+:SmallObject rdf:type owl:Class ;
+             rdfs:subClassOf :CriticalObject ;
+             rdfs:comment "A type of Critical Object"@en ;
+             rdfs:label "Small Object"@en .
+
+
 ###  https://saref.etsi.org/saref4auto/SpecialPermitParkingSpot
 :SpecialPermitParkingSpot rdf:type owl:Class ;
                           rdfs:subClassOf :ParkingSpot ;
-                          rdfs:comment "Parking spot reserved for special permits (authorities, disabled, blue Zone, resident ...)" ;
+                          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/Speed
 :Speed rdf:type owl:Class ;
-       rdfs:subClassOf <https://saref.etsi.org/core/Property> ;
+       rdfs:subClassOf saref:Property ;
+       rdfs:comment "A Property of interest for the automotive domain"@en ;
        rdfs:label "Speed"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/SpeedConfidence
 :SpeedConfidence rdf:type owl:Class ;
-                 rdfs:subClassOf <https://saref.etsi.org/saref4auto/Confidence> ,
+                 rdfs:subClassOf :Confidence ,
                                  [ rdf:type owl:Restriction ;
-                                   owl:onProperty <https://saref.etsi.org/saref4auto/hasConfidenceValue> ;
+                                   owl:onProperty :hasConfidenceValue ;
                                    owl:someValuesFrom xsd:int
                                  ] ;
-                 rdfs:comment "absolute accuracy of a speed value in cm/s"^^xsd:string ;
-                 rdfs:label "SpeedConfidence" .
-
+                 rdfs:comment "absolute accuracy of a speed value in cm/s"@en ;
+                 rdfs:label "SpeedConfidence"@en .
 
-###  https://saref.etsi.org/saref4auto/StartPoint
-:StartPoint rdf:type owl:Class ;
-            rdfs:subClassOf <http://www.w3.org/2003/01/geo/wgs84_pos#Point> ;
-            rdfs:label "StartPoint"@en .
-
-
-###  https://saref.etsi.org/saref4auto/TrafficLight
-:TrafficLight rdf:type owl:Class ;
-              rdfs:subClassOf :RoadSideActuator ,
-                              [ rdf:type owl:Restriction ;
-                                owl:onProperty :usesMeasurement ;
-                                owl:someValuesFrom <https://saref.etsi.org/core/Measurement>
-                              ] ;
-              rdfs:comment "A device that automatically operates coloured lights, typically red, amber, and green, for controlling traffic at road junctions, pedestrian crossings, and roundabouts." ;
-              rdfs:label "TrafficLight"@en .
-
-
-###  https://saref.etsi.org/saref4auto/VehicleAutomationLevel
-:VehicleAutomationLevel rdf:type owl:Class ;
-                        rdfs:subClassOf :AutomationLevel ;
-                        rdfs:comment """According to SAE J3016, there are five levels of automation:
-- Level 0: No Driving Automation.
-- Level 1: Driver assistance.
-- Level 2: Partial driving automation.
-- Level 3: Conditional driving automation.
-- Level 4: High driving automation.
-- Level 5: Full Driving automation.""" ;
-                        rdfs:label "VehicleAutomationLevel"@en .
 
+###  https://saref.etsi.org/saref4auto/SpeedUnit
+:SpeedUnit rdf:type owl:Class ;
+           rdfs:subClassOf saref:UnitOfMeasure .
 
-###  https://saref.etsi.org/saref4auto/VehicleLight
-:VehicleLight rdf:type owl:Class ;
-              rdfs:subClassOf <https://saref.etsi.org/core/Actuator> ,
-                              [ rdf:type owl:Restriction ;
-                                owl:onProperty <https://saref.etsi.org/core/hasState> ;
-                                owl:someValuesFrom :VehicleLightState
-                              ] ,
-                              [ rdf:type owl:Restriction ;
-                                owl:onProperty <https://saref.etsi.org/saref4syst/subSystemOf> ;
-                                owl:someValuesFrom <https://saref.etsi.org/saref4auto/ElectronicControlUnit>
-                              ] ;
-              rdfs:label "VehicleLight"@en .
 
-
-###  https://saref.etsi.org/saref4auto/VehicleLightState
-:VehicleLightState rdf:type owl:Class ;
-                   rdfs:subClassOf <https://saref.etsi.org/core/State> ;
-                   rdfs:label "VehicleLightState"@en .
-
-
-###  https://saref.etsi.org/saref4auto/Weight
-:Weight rdf:type owl:Class ;
-        rdfs:subClassOf <https://saref.etsi.org/core/Property> ;
-        rdfs:label "Weight"@en .
-
-
-###  https://saref.etsi.org/saref4auto/Width
-:Width rdf:type owl:Class ;
-       rdfs:subClassOf <https://saref.etsi.org/core/Property> ;
-       rdfs:label "Width"@en .
-
-
-###  https://saref.etsi.org/saref4auto/YawRate
-:YawRate rdf:type owl:Class ;
-         rdfs:subClassOf :Heading ;
-         rdfs:label "YawRate"@en .
-
-
-###  https://saref.etsi.org/saref4syst/System
-<https://saref.etsi.org/saref4syst/System> rdf:type owl:Class ;
-                                           rdfs:label "System"@en .
-
-
-###  https://saref.etsi.org/saref4auto/Car
-<https://saref.etsi.org/saref4auto/Car> rdf:type owl:Class ;
-                                       rdfs:subClassOf <https://saref.etsi.org/saref4auto/Vehicle> ;
-                                       rdfs:comment "A type of vehicle"@en ;
-                                       rdfs:label "Car"@en .
-
-
-###  https://saref.etsi.org/saref4auto/Confidence
-<https://saref.etsi.org/saref4auto/Confidence> rdf:type owl:Class ;
-                                              rdfs:subClassOf [ rdf:type owl:Restriction ;
-                                                                owl:onProperty :isMeasuredIn ;
-                                                                owl:someValuesFrom <https://saref.etsi.org/core/UnitOfMeasure>
-                                                              ] ,
-                                                              [ rdf:type owl:Restriction ;
-                                                                owl:onProperty :hasConfidenceValue ;
-                                                                owl:someValuesFrom xsd:int
-                                                              ]                                                             
-                                                              ;
-                                              rdfs:label "Confidence"@en .
+###  https://saref.etsi.org/saref4auto/Standalone
+:Standalone rdf:type owl:Class ;
+            rdfs:subClassOf :PlatoonState ,
+                            :PlatoonVehicleState .
 
 
-###  https://saref.etsi.org/saref4auto/CriticalObject
-<https://saref.etsi.org/saref4auto/CriticalObject> rdf:type owl:Class ;
-                                                  rdfs:subClassOf owl:Thing ;
-                                                  rdfs:comment "critical objects are small object, medium object, large object"^^xsd:string ;
-                                                  rdfs:label "CriticalObject"@en .
-
-
-###  https://saref.etsi.org/saref4auto/ElectronicControlUnit
-<https://saref.etsi.org/saref4auto/ElectronicControlUnit> rdf:type owl:Class ;
-                                                         rdfs:subClassOf <https://saref.etsi.org/core/Device> ,
-                                                                         <https://saref.etsi.org/saref4syst/System> ,
-                                                                         [ rdf:type owl:Restriction ;
-                                                                           owl:onProperty <https://saref.etsi.org/core/measuresProperty> ;
-                                                                           owl:someValuesFrom :Acceleration
-                                                                         ] ,
-                                                                         [ rdf:type owl:Restriction ;
-                                                                           owl:onProperty <https://saref.etsi.org/core/measuresProperty> ;
-                                                                           owl:someValuesFrom :Heading
-                                                                         ] ,
-                                                                         [ rdf:type owl:Restriction ;
-                                                                           owl:onProperty <https://saref.etsi.org/core/measuresProperty> ;
-                                                                           owl:someValuesFrom :Position
-                                                                         ] ,
-                                                                         [ rdf:type owl:Restriction ;
-                                                                           owl:onProperty <https://saref.etsi.org/core/measuresProperty> ;
-                                                                           owl:someValuesFrom :Speed
-                                                                         ] ,
-                                                                         [ rdf:type owl:Restriction ;
-                                                                           owl:onProperty <https://saref.etsi.org/saref4syst/hasSubSystem> ;
-                                                                           owl:someValuesFrom :VehicleLight
-                                                                         ] ,
-                                                                         [ rdf:type owl:Restriction ;
-                                                                           owl:onProperty <https://saref.etsi.org/saref4syst/subSystemOf> ;
-                                                                           owl:someValuesFrom <https://saref.etsi.org/saref4auto/Vehicle>
-                                                                         ] ;
-                                                         rdfs:label "ElectronicControlUnit"@en .
+###  https://saref.etsi.org/saref4auto/StartPoint
+:StartPoint rdf:type owl:Class ;
+            rdfs:subClassOf :Point ;
+            rdfs:comment "The starting point of a route"@en ;
+            rdfs:label "StartPoint"@en .
 
 
-###  https://saref.etsi.org/saref4auto/Identifier
-<https://saref.etsi.org/saref4auto/Identifier> rdf:type owl:Class ;
-                                              rdfs:subClassOf [ rdf:type owl:Restriction ;
-                                                                owl:onProperty :hasIDValue ;
-                                                                owl:someValuesFrom xsd:string
-                                                              ] ;
-                                              rdfs:comment "A class used to identify 1)  a vehicle (station) during data exchange with other devices/stations 2) a platoon during data exchange with other devices/stations, 3)  a parking spot within a parking area during data exchange with other devices/stations. In all cases, this identifier may be a pseudonym. It may change over space and/or over time." ;
-                                              rdfs:label "Identifier"@en .
+###  https://saref.etsi.org/saref4auto/State
+:State rdf:type owl:Class ;
+       rdfs:subClassOf saref:State ,
+                       [ rdf:type owl:Restriction ;
+                         owl:onProperty saref:hasTimestamp ;
+                         owl:someValuesFrom xsd:dateTime
+                       ] ;
+       rdfs:comment "A class dedicated to describe the relevant states in the automotive domain"@en ;
+       rdfs:label "State"@en .
 
 
-###  https://saref.etsi.org/saref4auto/Movement
-<https://saref.etsi.org/saref4auto/Movement> rdf:type owl:Class ;
-                                            rdfs:subClassOf <https://saref.etsi.org/core/Property> ;
-                                            rdfs:comment "Relevant types of movement are: Static (position only), moving in same direction (speed, acceleration), moving in reverse direction (speed acceleration), crossing (speed, acceleration, direction)"^^xsd:string ;
-                                            rdfs:label "Movement" .
+###  https://saref.etsi.org/saref4auto/StationID
+:StationID rdf:type owl:Class ;
+           rdfs:subClassOf :Identifier ;
+           rdfs:comment "A type of identifier for vehicles and platoons, as defined in ETSI TS 102 894-2."@en ;
+           rdfs:label "StationID"@en .
 
 
-###  https://saref.etsi.org/saref4auto/NotifiedEvent
-<https://saref.etsi.org/saref4auto/NotifiedEvent> rdf:type owl:Class ;
-                                                 rdfs:subClassOf owl:Thing ;
-                                                 rdfs:comment "The relevant types of events are trafficCondition, accident, roadworks, impassability, adverseWeatherCondition-Adhesion, aquaplannning, hazardousLocation-SurfaceCondition, hazardousLocation-ObstacleOnTheRoad, hazardousLocation-AnimalOnTheRoad, humanPresenceOnTheRoad, wrongWayDriving, rescueAndRecoveryWorkInProgress, adverseWeatherCondition-ExtremeWeatherCondition, adverseWeatherCondition-Visibility, adverseWeatherCondition-Precipitation, slowVehicle, dangerousEndOfQueue, vehicleBreakdown, postCrash, humanProblem, stationaryVehicle, emergencyVehicleApproaching, hazardousLocation-DangerousCurve, collisionRisk, signalViolation, dangerousSituation"^^xsd:string ;
-                                                 rdfs:label "NotifiedEvent"@en .
+###  https://saref.etsi.org/saref4auto/TrafficLightController
+:TrafficLightController rdf:type owl:Class ;
+                        rdfs:subClassOf :RoadSideActuator ,
+                                        [ rdf:type owl:Restriction ;
+                                          owl:onProperty :usesMeasurement ;
+                                          owl:someValuesFrom saref:Measurement
+                                        ] ;
+                        rdfs:comment "A device that automatically operates coloured lights, typically red, amber, and green, for controlling traffic at road junctions, pedestrian crossings, and roundabouts."@en ;
+                        rdfs:label "TrafficLight"@en .
 
 
-###  https://saref.etsi.org/saref4auto/PersonalDevice
-<https://saref.etsi.org/saref4auto/PersonalDevice> rdf:type owl:Class ;
-                                                  rdfs:subClassOf :AutomotiveObject ;
-                                                  rdfs:label "PersonalDevice"@en .
+###  https://saref.etsi.org/saref4auto/TrafficManagementCentre
+:TrafficManagementCentre rdf:type owl:Class ;
+                         rdfs:subClassOf :AutomotiveObject ;
+                         rdfs:label "TrafficManagementCentre"@en .
 
 
-###  https://saref.etsi.org/saref4auto/Platoon
-<https://saref.etsi.org/saref4auto/Platoon> rdf:type owl:Class ;
-                                           rdfs:subClassOf [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasDestination ;
-                                                             owl:someValuesFrom :EndPoint
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasIdentifier ;
-                                                             owl:someValuesFrom <https://saref.etsi.org/saref4auto/Identifier>
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasMaxSize ;
-                                                             owl:someValuesFrom :Size
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasMember ;
-                                                             owl:someValuesFrom <https://saref.etsi.org/saref4auto/Vehicle>
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasRoute ;
-                                                             owl:someValuesFrom :Route
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasSize ;
-                                                             owl:someValuesFrom :Size
-                                                           ] ;
-                                           rdfs:comment "A group of vehicles automatically following each other at a relatively close distance" ;
-                                           rdfs:label "Platoon"@en .
+###  https://saref.etsi.org/saref4auto/Tram
+:Tram rdf:type owl:Class ;
+      rdfs:subClassOf :PublicTransport .
 
 
-###  https://saref.etsi.org/saref4auto/PlatoonRole
-<https://saref.etsi.org/saref4auto/PlatoonRole> rdf:type owl:Class ;
-                                               rdfs:subClassOf <https://saref.etsi.org/saref4auto/Role> ;
-                                               rdfs:comment "In platoon a vehicle can assume roles such as: unknown, leader, follower, ready-for-leading, trailing, etc." ;
-                                               rdfs:label "PlatoonRole"@en .
+###  https://saref.etsi.org/saref4auto/Truck
+:Truck rdf:type owl:Class ;
+       rdfs:subClassOf :Vehicle ;
+       rdfs:comment "A type of vehicle"@en ;
+       rdfs:label "Truck"@en .
 
 
-###  https://saref.etsi.org/saref4auto/PublicTransport
-<https://saref.etsi.org/saref4auto/PublicTransport> rdf:type owl:Class ;
-                                                   rdfs:subClassOf <https://saref.etsi.org/saref4auto/Vehicle> ;
-                                                   rdfs:comment "A type of vehicle"@en ;
-                                                   rdfs:label "PublicTransport"@en .
+###  https://saref.etsi.org/saref4auto/TwoWheeler
+:TwoWheeler rdf:type owl:Class ;
+            rdfs:subClassOf :Vehicle ;
+            rdfs:comment "A type of vehicle"@en ;
+            rdfs:label "TwoWheeler"@en .
 
 
-###  https://saref.etsi.org/saref4auto/RelativePosition
-<https://saref.etsi.org/saref4auto/RelativePosition> rdf:type owl:Class ;
-                                                    rdfs:subClassOf :Position ,
-                                                                    [ rdf:type owl:Restriction ;
-                                                                      owl:onProperty <https://saref.etsi.org/saref4auto/hasCoordinateX> ;
-                                                                      owl:someValuesFrom xsd:float
-                                                                    ] ,
-                                                                    [ rdf:type owl:Restriction ;
-                                                                      owl:onProperty <https://saref.etsi.org/saref4auto/hasCoordinateY> ;
-                                                                      owl:someValuesFrom xsd:float
-                                                                    ] ,
-                                                                    [ rdf:type owl:Restriction ;
-                                                                      owl:onProperty <https://saref.etsi.org/saref4auto/hasCoordinateZ> ;
-                                                                      owl:someValuesFrom xsd:float
-                                                                    ] ;
-                                                    rdfs:comment "It represents the relative position of a vehicle (e.g., a car is x,y,z in front of another car)"@en ;
-                                                    rdfs:label "RelativePosition"@en .
+###  https://saref.etsi.org/saref4auto/UUID
+:UUID rdf:type owl:Class ;
+      rdfs:subClassOf :Identifier ;
+      rdfs:comment "A type of identifier for vehicles and platoons"@en ;
+      rdfs:label "UUID"@en .
 
 
-###  https://saref.etsi.org/saref4auto/RoadSideEquipment
-<https://saref.etsi.org/saref4auto/RoadSideEquipment> rdf:type owl:Class ;
-                                                     rdfs:subClassOf :AutomotiveObject ;
-                                                     rdfs:label "RoadSideEquipment"@en .
+###  https://saref.etsi.org/saref4auto/Unknown
+:Unknown rdf:type owl:Class ;
+         rdfs:subClassOf :PlatoonState ,
+                         :PlatoonVehicleState .
 
 
-###  https://saref.etsi.org/saref4auto/Role
-<https://saref.etsi.org/saref4auto/Role> rdf:type owl:Class ;
-                                        rdfs:label "Role"@en .
+###  https://saref.etsi.org/saref4auto/Vehicle
+:Vehicle rdf:type owl:Class ;
+         rdfs:subClassOf saref:FeatureOfInterest ,
+                         :AutomotiveObject ,
+                         s4syst:System ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasAbsolutePosition ;
+                           owl:someValuesFrom :AbsolutePosition
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasAutomationLevel ;
+                           owl:someValuesFrom :AutomationLevel
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasBrakeCapacity ;
+                           owl:someValuesFrom :BrakeCapacity
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasDestinationAddress ;
+                           owl:someValuesFrom :Address
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasDestinationEndPoint ;
+                           owl:someValuesFrom :EndPoint
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasEnvironment ;
+                           owl:someValuesFrom :VehicleEnvironment
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasEstimatedRendezvousLocation ;
+                           owl:someValuesFrom :RendezvousLocation
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasHeight ;
+                           owl:someValuesFrom :Height
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasIdentifier ;
+                           owl:someValuesFrom :Identifier
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasLength ;
+                           owl:someValuesFrom :Length
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasParkingVehicleState ;
+                           owl:someValuesFrom :PlatoonVehicleState
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasPlatoonPosition ;
+                           owl:someValuesFrom :PlatoonPosition
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasPlatoonRole ;
+                           owl:someValuesFrom :PlatoonRole
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasPlatoonVehicleState ;
+                           owl:someValuesFrom :PlatoonVehicleState
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasRelativePosition ;
+                           owl:someValuesFrom :RelativePosition
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasRoadTopologyPosition ;
+                           owl:someValuesFrom :RoadTopologyPosition
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasRoute ;
+                           owl:someValuesFrom :Route
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasVehicleRole ;
+                           owl:someValuesFrom :VehicleRole
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasWidth ;
+                           owl:someValuesFrom :Width
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :isMemberOfPlatoon ;
+                           owl:someValuesFrom :Platoon
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :isMemberOfVehicleEnvironment ;
+                           owl:someValuesFrom :VehicleEnvironment
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty s4syst:hasSubSystem ;
+                           owl:someValuesFrom :ElectronicControlUnit
+                         ] ,
+                         [ rdf:type owl:Restriction ;
+                           owl:onProperty :hasEstimatedJoiningTime ;
+                           owl:someValuesFrom xsd:dateTime
+                         ] ;
+         rdfs:comment """A vehicle is the main object of interest in the automotive domain. Example of types of vehicles are car, truck, public transport and two wheeler. See ETSI
+TS 102 894-2 spec for full list of vehicles, which are type of \"stations\". See also the SENSORIS data model for possible type of vehicles."""@en ;
+         rdfs:label "Vehicle"@en .
 
 
-###  https://saref.etsi.org/saref4auto/StationID
-<https://saref.etsi.org/saref4auto/StationID> rdf:type owl:Class ;
-                                             rdfs:subClassOf <https://saref.etsi.org/saref4auto/Identifier> ;
-                                             rdfs:comment "A type of identifier for vehicles and platoons, as defined in ETSI TS 102 894-2." ;
-                                             rdfs:label "StationID"@en .
+###  https://saref.etsi.org/saref4auto/VehicleAutomationLevel
+:VehicleAutomationLevel rdf:type owl:Class ;
+                        rdfs:subClassOf :AutomationLevel ;
+                        rdfs:comment """According to SAE J3016, there are five levels of automation for a vehicle:
+- Level 0: No Driving Automation.
+- Level 1: Driver assistance.
+- Level 2: Partial driving automation.
+- Level 3: Conditional driving automation.
+- Level 4: High driving automation.
+- Level 5: Full Driving automation."""@en ;
+                        rdfs:label "VehicleAutomationLevel"@en .
 
 
-###  https://saref.etsi.org/saref4auto/TrafficManagementCentre
-<https://saref.etsi.org/saref4auto/TrafficManagementCentre> rdf:type owl:Class ;
-                                                           rdfs:subClassOf :AutomotiveObject ;
-                                                           rdfs:label "TrafficManagementCentre"@en .
+###  https://saref.etsi.org/saref4auto/VehicleEnvironment
+:VehicleEnvironment rdf:type owl:Class ;
+                    rdfs:subClassOf [ rdf:type owl:Restriction ;
+                                      owl:onProperty :consistsOfEntity ;
+                                      owl:someValuesFrom :RoadEntity
+                                    ] ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty :consistsOfVehicle ;
+                                      owl:someValuesFrom :Vehicle
+                                    ] ;
+                    rdfs:comment "The vehicle environment is made of entities which are present on the road in the area around the vehicle" ;
+                    rdfs:label "VehicleEnvironment"@en .
 
 
-###  https://saref.etsi.org/saref4auto/Truck
-<https://saref.etsi.org/saref4auto/Truck> rdf:type owl:Class ;
-                                         rdfs:subClassOf <https://saref.etsi.org/saref4auto/Vehicle> ;
-                                         rdfs:comment "A type of vehicle"@en ;
-                                         rdfs:label "Truck"@en .
+###  https://saref.etsi.org/saref4auto/VehicleRole
+:VehicleRole rdf:type owl:Class ;
+             rdfs:subClassOf :Role ;
+             rdfs:comment "The role the vehicle plays in traffic. If not specified, it is assumed that it takes a default value. Otherwise, possible values to be specified are: publicTransport, specialTransport, dangerousGoods, roadWork, rescue, emergency, safetyCar, agriculture, commercial, military, roadOperator, taxi."@en ;
+             rdfs:label "VehicleRole"@en .
 
 
-###  https://saref.etsi.org/saref4auto/TwoWheeler
-<https://saref.etsi.org/saref4auto/TwoWheeler> rdf:type owl:Class ;
-                                              rdfs:subClassOf <https://saref.etsi.org/saref4auto/Vehicle> ;
-                                              rdfs:comment "A type of vehicle"@en ;
-                                              rdfs:label "TwoWheeler"@en .
+###  https://saref.etsi.org/saref4auto/VulnerableRoadUser
+:VulnerableRoadUser rdf:type owl:Class ;
+                    rdfs:subClassOf owl:Thing ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty :hasHeight ;
+                                      owl:someValuesFrom :Height
+                                    ] ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty :hasLength ;
+                                      owl:someValuesFrom :Length
+                                    ] ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty :hasMovement ;
+                                      owl:someValuesFrom :Movement
+                                    ] ,
+                                    [ rdf:type owl:Restriction ;
+                                      owl:onProperty :hasWidth ;
+                                      owl:someValuesFrom :Width
+                                    ] ;
+                    rdfs:comment "Non-motorized road users as well as users of VRU vehicles (L class of vehicles, for example mopeds or motorcycles, etc.) participating to the road traffic" ;
+                    rdfs:label "VulnerableRoadUser"@en .
 
 
-###  https://saref.etsi.org/saref4auto/UUID
-<https://saref.etsi.org/saref4auto/UUID> rdf:type owl:Class ;
-                                        rdfs:subClassOf <https://saref.etsi.org/saref4auto/Identifier> ;
-                                        rdfs:comment "A type of identifier for vehicles and platoons" ;
-                                        rdfs:label "UUID"@en .
+###  https://saref.etsi.org/saref4auto/Weight
+:Weight rdf:type owl:Class ;
+        rdfs:subClassOf saref:Property ;
+        rdfs:comment "A Property of interest for the automotive domain"@en ;
+        rdfs:label "Weight"@en .
 
 
-###  https://saref.etsi.org/saref4auto/Vehicle
-<https://saref.etsi.org/saref4auto/Vehicle> rdf:type owl:Class ;
-                                           rdfs:subClassOf <https://saref.etsi.org/core/FeatureOfInterest> ,
-                                                           :AutomotiveObject ,
-                                                           <https://saref.etsi.org/saref4syst/System> ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasAutomationLevel ;
-                                                             owl:someValuesFrom :AutomationLevel
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasBrakeCapacity ;
-                                                             owl:someValuesFrom :BrakeCapacity
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasDestination ;
-                                                             owl:someValuesFrom :Adress
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasDestination ;
-                                                             owl:someValuesFrom :EndPoint
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasEstimatedRendezvousLocation ;
-                                                             owl:someValuesFrom :RendezvousLocation
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasHeight ;
-                                                             owl:someValuesFrom :Height
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasIdentifier ;
-                                                             owl:someValuesFrom <https://saref.etsi.org/saref4auto/Identifier>
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasLength ;
-                                                             owl:someValuesFrom :Length
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasPosition ;
-                                                             owl:someValuesFrom <http://www.opengis.net/ont/geosparql#AbsolutePosition>
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasPosition ;
-                                                             owl:someValuesFrom :PlatoonPosition
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasPosition ;
-                                                             owl:someValuesFrom :RoadTopologyPosition
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasPosition ;
-                                                             owl:someValuesFrom <https://saref.etsi.org/saref4auto/RelativePosition>
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasRole ;
-                                                             owl:someValuesFrom <https://saref.etsi.org/saref4auto/VehicleRole>
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasRoute ;
-                                                             owl:someValuesFrom :Route
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasWidth ;
-                                                             owl:someValuesFrom :Width
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :isMemberOf ;
-                                                             owl:someValuesFrom <https://saref.etsi.org/saref4auto/Platoon>
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :isMemberOf ;
-                                                             owl:someValuesFrom <https://saref.etsi.org/saref4auto/VehicleEnvironment>
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty <https://saref.etsi.org/saref4syst/hasSubSystem> ;
-                                                             owl:someValuesFrom <https://saref.etsi.org/saref4auto/ElectronicControlUnit>
-                                                           ] ,
-                                                           [ rdf:type owl:Restriction ;
-                                                             owl:onProperty :hasEstimatedJoiningTime ;
-                                                             owl:someValuesFrom xsd:dateTime
-                                                           ] ;
-                                           rdfs:comment """A vehicle is the main object of interest in the automotive domain. Example of types of vehicles are car, truck, public transport and two wheeler. See ETSI
-TS 102 894-2 spec for full list of vehicles, which are type of \"stations\". See also the SENSORIS data model for possible type of vehicles."""@en ;
-                                           rdfs:label "Vehicle"@en .
+###  https://saref.etsi.org/saref4auto/Width
+:Width rdf:type owl:Class ;
+       rdfs:subClassOf saref:Property ;
+       rdfs:comment "A Property of interest for the automotive domain"@en ;
+       rdfs:label "Width"@en .
 
 
-###  https://saref.etsi.org/saref4auto/VehicleEnvironment
-<https://saref.etsi.org/saref4auto/VehicleEnvironment> rdf:type owl:Class ;
-                                                      rdfs:subClassOf [ rdf:type owl:Restriction ;
-                                                                        owl:onProperty :consistsOf ;
-                                                                        owl:someValuesFrom :RoadEntity
-                                                                      ] ,
-                                                                      [ rdf:type owl:Restriction ;
-                                                                        owl:onProperty :consistsOf ;
-                                                                        owl:someValuesFrom <https://saref.etsi.org/saref4auto/Vehicle>
-                                                                      ] ;
-                                                      rdfs:label "VehicleEnvironment"@en .
+###  https://saref.etsi.org/saref4auto/WidthUnit
+:WidthUnit rdf:type owl:Class ;
+           rdfs:subClassOf saref:UnitOfMeasure .
 
 
-###  https://saref.etsi.org/saref4auto/VehicleRole
-<https://saref.etsi.org/saref4auto/VehicleRole> rdf:type owl:Class ;
-                                               rdfs:subClassOf <https://saref.etsi.org/saref4auto/Role> ;
-                                               rdfs:comment "The role the vehicle plays in traffic. If not specified, it is assumed that it takes a default value. Otherwise, possible values to be specified are: publicTransport, specialTransport, dangerousGoods, roadWork, rescue, emergency, safetyCar, agriculture, commercial, military, roadOperator, taxi."^^xsd:string ;
-                                               rdfs:label "VehicleRole"@en .
+###  https://saref.etsi.org/saref4auto/YawRate
+:YawRate rdf:type owl:Class ;
+         rdfs:subClassOf :Heading ;
+         rdfs:comment "A type of heading"@en ;
+         rdfs:label "YawRate"@en .
 
 
-###  https://saref.etsi.org/saref4auto/VulnerableRoadUser
-<https://saref.etsi.org/saref4auto/VulnerableRoadUser> rdf:type owl:Class ;
-                                                      rdfs:subClassOf owl:Thing ;
-                                                      rdfs:label "VulnerableRoadUser"@en .
+###  https://saref.etsi.org/saref4syst/System
+s4syst:System rdf:type owl:Class ;
+              rdfs:label "System"@en .
 
 
 #################################################################
 #    Individuals
 #################################################################
 
-###  https://etsi.saref.org/saref4auto/agriculture
-<https://etsi.saref.org/saref4auto/agriculture> rdf:type owl:NamedIndividual ,
-                                                         <https://saref.etsi.org/saref4auto/VehicleRole> ;
+###  https://saref.etsi.org/saref4auto/agriculture
+<https://saref.etsi.org/saref4auto/agriculture> rdf:type owl:NamedIndividual ,
+                                                         :VehicleRole ;
                                                 rdfs:label "agriculture"@en .
 
 
-###  https://etsi.saref.org/saref4auto/specialTransport
-<https://etsi.saref.org/saref4auto/specialTransport> rdf:type owl:NamedIndividual ,
-                                                              <https://saref.etsi.org/saref4auto/VehicleRole> ;
+###  https://saref.etsi.org/saref4auto/specialTransport
+<https://saref.etsi.org/saref4auto/specialTransport> rdf:type owl:NamedIndividual ,
+                                                              :VehicleRole ;
                                                      rdfs:label "specialTransport"@en .
 
 
-###  https://saref.etsi.org/saref4auto/bus
-:bus rdf:type owl:NamedIndividual ;
-                         rdfs:label "bus"@en .
-
-
-###  https://saref.etsi.org/saref4auto/passengerCar
-:passengerCar rdf:type owl:NamedIndividual ;
-                         rdfs:label "passengerCar"@en .
-
-
-###  https://saref.etsi.org/saref4auto/tram
-:tram rdf:type owl:NamedIndividual ,
-                                  <https://saref.etsi.org/saref4auto/PublicTransport> ;
-                         rdfs:label "tram"@en .
-
-
-###  https://saref.etsi.org/saref4auto/heavyTruck
-:heavyTruck rdf:type owl:NamedIndividual ;
-                         rdfs:label "heavyTruck"@en .
-
-
-###  https://saref.etsi.org/saref4auto/lightTruck
-:lightTruck rdf:type owl:NamedIndividual ;
-                         rdfs:label "lightTruck"@en .
-
-
-###  https://saref.etsi.org/saref4auto/trailer
-:trailer rdf:type owl:NamedIndividual ;
-                         rdfs:label "trailer"@en .
-
-
-###  https://saref.etsi.org/saref4auto/animal
-:animal rdf:type owl:NamedIndividual ,
-                 <https://saref.etsi.org/saref4auto/VulnerableRoadUser> ;
-        rdfs:comment "animals presenting a safety risk to other road users, for example : dogs, wild animals, horses, cows, sheep, kangaroos, etc."^^xsd:string ;
-        rdfs:label "animals"@en .
-
+###  https://saref.etsi.org/saref4auto/commercial
+:commercial rdf:type owl:NamedIndividual ,
+                     :VehicleRole ;
+            rdfs:label "commercial"@en .
 
-###  https://saref.etsi.org/saref4auto/assembling
-:assembling rdf:type owl:NamedIndividual ,
-                     :PlatoonState ;
-            rdfs:label "assembling"@en .
 
+###  https://saref.etsi.org/saref4auto/crossingLeft
+:crossingLeft rdf:type owl:NamedIndividual ,
+                       :Movement .
 
-###  https://saref.etsi.org/saref4auto/bicyclist
-:bicyclist rdf:type owl:NamedIndividual ,
-                    <https://saref.etsi.org/saref4auto/VulnerableRoadUser> ;
-           rdfs:comment "for example: user of bicycle, wheelchair, skater, scooter, Segway, or a mounted horse rider"^^xsd:string ;
-           rdfs:label "bicyclist"@en .
 
-
-###  https://saref.etsi.org/saref4auto/commercial
-:commercial rdf:type owl:NamedIndividual ,
-                     <https://saref.etsi.org/saref4auto/VehicleRole> ;
-            rdfs:label "commercial"@en .
+###  https://saref.etsi.org/saref4auto/crossingRight
+:crossingRight rdf:type owl:NamedIndividual ,
+                        :Movement .
 
 
 ###  https://saref.etsi.org/saref4auto/dangerousGood
 :dangerousGood rdf:type owl:NamedIndividual ,
-                        <https://saref.etsi.org/saref4auto/VehicleRole> ;
+                        :VehicleRole ;
                rdfs:label "dangerousGoods"@en .
 
 
-###  https://saref.etsi.org/saref4auto/disengaging
-:disengaging rdf:type owl:NamedIndividual ,
-                      :PlatoonState ,
-                      :PlatoonVehicleState ;
-             rdfs:label "disengaging"@en .
-
-
 ###  https://saref.etsi.org/saref4auto/emergency
 :emergency rdf:type owl:NamedIndividual ,
-                    <https://saref.etsi.org/saref4auto/VehicleRole> ;
+                    :VehicleRole ;
            rdfs:label "emergency"@en .
 
 
-###  https://saref.etsi.org/saref4auto/engaging
-:engaging rdf:type owl:NamedIndividual ,
-                   :PlatoonVehicleState .
-
-
 ###  https://saref.etsi.org/saref4auto/follower
 :follower rdf:type owl:NamedIndividual ,
-                   <https://saref.etsi.org/saref4auto/PlatoonRole> .
-
-
-###  https://saref.etsi.org/saref4auto/forming
-:forming rdf:type owl:NamedIndividual ,
-                  :PlatoonVehicleState .
-
-
-###  https://saref.etsi.org/saref4auto/largeObject
-:largeObject rdf:type owl:NamedIndividual ,
-                      <https://saref.etsi.org/saref4auto/CriticalObject> ;
-             rdfs:label "largeObject" .
+                   :PlatoonRole .
 
 
 ###  https://saref.etsi.org/saref4auto/leader
 :leader rdf:type owl:NamedIndividual ,
-                 <https://saref.etsi.org/saref4auto/PlatoonRole> .
-
-
-###  https://saref.etsi.org/saref4auto/mediumObject
-:mediumObject rdf:type owl:NamedIndividual ,
-                       <https://saref.etsi.org/saref4auto/CriticalObject> ;
-              rdfs:label "mediumObject" .
+                 :PlatoonRole .
 
 
 ###  https://saref.etsi.org/saref4auto/military
 :military rdf:type owl:NamedIndividual ,
-                   <https://saref.etsi.org/saref4auto/VehicleRole> ;
+                   :VehicleRole ;
           rdfs:label "military"@en .
 
 
-###  https://saref.etsi.org/saref4auto/motorcycle
-:motorcycle rdf:type owl:NamedIndividual ,
-                     <https://saref.etsi.org/saref4auto/VulnerableRoadUser> ;
-            rdfs:label "motorcycle"@en .
-
-
-###  https://saref.etsi.org/saref4auto/pedestrian
-:pedestrian rdf:type owl:NamedIndividual ,
-                     <https://saref.etsi.org/saref4auto/VulnerableRoadUser> ;
-            rdfs:comment "for example: adult, child, elderly person, pram, animal, blind person guided by a dog, rider off its bike"^^xsd:string ;
-            rdfs:label "pedestrians"@en .
-
-
-###  https://saref.etsi.org/saref4auto/platooning
-:platooning rdf:type owl:NamedIndividual ,
-                     :PlatoonState ,
-                     :PlatoonVehicleState ;
-            rdfs:label "platooning"@en .
-
-
 ###  https://saref.etsi.org/saref4auto/publicTransport
 :publicTransport rdf:type owl:NamedIndividual ,
-                          <https://saref.etsi.org/saref4auto/VehicleRole> ;
+                          :VehicleRole ;
                  rdfs:label "publicTransport"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/ready_for_leading
 :ready_for_leading rdf:type owl:NamedIndividual ,
-                            <https://saref.etsi.org/saref4auto/PlatoonRole> .
+                            :PlatoonRole .
 
 
 ###  https://saref.etsi.org/saref4auto/rescue
 :rescue rdf:type owl:NamedIndividual ,
-                 <https://saref.etsi.org/saref4auto/VehicleRole> ;
+                 :VehicleRole ;
         rdfs:label "rescue"@en .
 
 
+###  https://saref.etsi.org/saref4auto/reverseDirection
+:reverseDirection rdf:type owl:NamedIndividual ,
+                           :Movement .
+
+
 ###  https://saref.etsi.org/saref4auto/roadOperator
 :roadOperator rdf:type owl:NamedIndividual ,
-                       <https://saref.etsi.org/saref4auto/VehicleRole> ;
+                       :VehicleRole ;
               rdfs:label "roadOperator"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/roadWork
 :roadWork rdf:type owl:NamedIndividual ,
-                   <https://saref.etsi.org/saref4auto/VehicleRole> ;
+                   :VehicleRole ;
           rdfs:label "roadWork"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/safetyCar
 :safetyCar rdf:type owl:NamedIndividual ,
-                    <https://saref.etsi.org/saref4auto/VehicleRole> ;
+                    :VehicleRole ;
            rdfs:label "safetyCar"@en .
 
 
-###  https://saref.etsi.org/saref4auto/searching
-:searching rdf:type owl:NamedIndividual ,
-                    :PlatoonVehicleState .
-
+###  https://saref.etsi.org/saref4auto/sameDirection
+:sameDirection rdf:type owl:NamedIndividual ,
+                        :Movement .
 
-###  https://saref.etsi.org/saref4auto/smallObject
-:smallObject rdf:type owl:NamedIndividual ,
-                      <https://saref.etsi.org/saref4auto/CriticalObject> ;
-             rdfs:label "smallObject" .
 
-
-###  https://saref.etsi.org/saref4auto/standalone
-:standalone rdf:type owl:NamedIndividual ,
-                     :PlatoonState ,
-                     :PlatoonVehicleState ;
-            rdfs:label "standalone"@en .
+###  https://saref.etsi.org/saref4auto/static
+:static rdf:type owl:NamedIndividual ,
+                 :Movement .
 
 
 ###  https://saref.etsi.org/saref4auto/taxi
 :taxi rdf:type owl:NamedIndividual ,
-               <https://saref.etsi.org/saref4auto/VehicleRole> ;
+               :VehicleRole ;
       rdfs:label "taxi"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/trailing
 :trailing rdf:type owl:NamedIndividual ,
-                   <https://saref.etsi.org/saref4auto/PlatoonRole> .
+                   :PlatoonRole .
 
 
 ###  https://saref.etsi.org/saref4auto/unknown
 :unknown rdf:type owl:NamedIndividual ,
-                  :PlatoonState ,
-                  :PlatoonVehicleState ,
-                  <https://saref.etsi.org/saref4auto/PlatoonRole> ;
-         rdfs:label "unknown"@en .
-
-
-#################################################################
-#    Annotations
-#################################################################
-
-:hasRole rdfs:label "hasRole"@en ;
-         rdfs:comment "The role the vehicle plays in traffic. Possible values are: publicTransport, specialTransport, dangerousGoods, roadWork, rescue, emergency, safetyCar, agriculture, commercial, military, roadOperator, taxi."^^xsd:string .
+                  :PlatoonRole .
 
 
 ###  Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi