diff --git a/examples/example1.ttl b/examples/example1.ttl
index d84fe0c22c7cf27bc7961343c6b5f465ed1eb559..208d48b99c2f51958955d35d71a2b1db5f6ee356 100644
--- a/examples/example1.ttl
+++ b/examples/example1.ttl
@@ -1,25 +1,34 @@
-@prefix : <https://saref.etsi.org/saref4auto/example/> .
+
+@prefix ex: <https://saref.etsi.org/saref4auto/example> .
+@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .
 @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#> .
-@base <https://saref.etsi.org/saref4auto/example> .
-
-<https://saref.etsi.org/saref4auto/example> rdf:type owl:Ontology ;
-                                             <http://purl.org/dc/terms/description> "An example of SAREF4AUTO for the use cases Platooning, AVP and CPS"@en ;
-                                             <http://purl.org/dc/terms/license> <https://forge.etsi.org/etsi-software-license> ;
-                                             <http://purl.org/dc/terms/publisher> <https://www.etsi.org/> ;
-                                             <http://purl.org/dc/terms/source> <https://forge.etsi.org/rep/SAREF/saref4auto/example/> ;
-                                             <http://purl.org/dc/terms/title> "Example instances for SAREF extension to automotive"@en ;
-                                             <http://purl.org/vocab/vann/preferredNamespacePrefix> "s4auto-ex" ;
-                                             <http://purl.org/vocab/vann/preferredNamespaceUri> "https://saref.etsi.org/saref4auto/example/" ;
-                                             owl:versionInfo "1.0" .
-
+@prefix time: <http://www.w3.org/2006/time#> .
+@prefix geosp: <http://www.opengis.net/ont/geosparql#> .
+@prefix saref: <https://saref.etsi.org/core/> .
+@prefix s4auto: <https://saref.etsi.org/saref4auto> .
+@prefix s4syst: <https://saref.etsi.org/saref4syst/> .
+@prefix dctype: <http://purl.org/dc/dcmitype/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
+
+
+<https://saref.etsi.org/saref4auto/example> a dctype:Dataset ;
+                                            dcterms:license <https://forge.etsi.org/etsi-software-license> ;
+											dcterms:conformsTo <https://saref.etsi.org/saref4auto/v1.1.1/> ;
+											dcterms:title "Example instances for SAREF extension to automotive"@en ;
+											dcterms:description "An example of SAREF4AUTO for the use cases Platooning, AVP and CPS"@en .
+											 
+										 											
 #################################################################
 #    Annotation properties
 #################################################################
 
+###  http://purl.org/dc/terms/conformsTo
+<http://purl.org/dc/terms/conformsTo> rdf:type owl:AnnotationProperty .
+
 ###  http://purl.org/dc/terms/description
 <http://purl.org/dc/terms/description> rdf:type owl:AnnotationProperty .
 
@@ -28,31 +37,15 @@
 <http://purl.org/dc/terms/license> rdf:type owl:AnnotationProperty .
 
 
-###  http://purl.org/dc/terms/publisher
-<http://purl.org/dc/terms/publisher> rdf:type owl:AnnotationProperty .
-
-
-###  http://purl.org/dc/terms/source
-<http://purl.org/dc/terms/source> rdf:type owl:AnnotationProperty .
-
-
 ###  http://purl.org/dc/terms/title
 <http://purl.org/dc/terms/title> rdf:type owl:AnnotationProperty .
 
 
-###  http://purl.org/vocab/vann/preferredNamespacePrefix
-<http://purl.org/vocab/vann/preferredNamespacePrefix> rdf:type owl:AnnotationProperty .
-
-
-###  http://purl.org/vocab/vann/preferredNamespaceUri
-<http://purl.org/vocab/vann/preferredNamespaceUri> rdf:type owl:AnnotationProperty .
-
 
 #################################################################
 #    Object Properties
 #################################################################
 
-
 ###  http://www.opengis.net/ont/geosparql#hasGeometry
 <http://www.opengis.net/ont/geosparql#hasGeometry> rdf:type owl:ObjectProperty .
 
@@ -65,21 +58,20 @@
 <http://www.w3.org/2006/time#hasEnd> rdf:type owl:ObjectProperty .
 
 
-
 ###  https://saref.etsi.org/core/hasConfidenceUnitOfMeasure
-<https://saref.etsi.org/core/hasConfidenceUnitOfMeasure> rdf:type owl:ObjectProperty .
+saref:hasConfidenceUnitOfMeasure rdf:type owl:ObjectProperty .
 
 
 ###  https://saref.etsi.org/core/hasProperty
-<https://saref.etsi.org/core/hasProperty> rdf:type owl:ObjectProperty .
+saref:hasProperty rdf:type owl:ObjectProperty .
 
 
 ###  https://saref.etsi.org/core/isMeasuredIn
-<https://saref.etsi.org/core/isMeasuredIn> rdf:type owl:ObjectProperty .
+saref:isMeasuredIn rdf:type owl:ObjectProperty .
 
 
 ###  https://saref.etsi.org/core/relatesToMeasurement
-<https://saref.etsi.org/core/relatesToMeasurement> rdf:type owl:ObjectProperty .
+saref:relatesToMeasurement rdf:type owl:ObjectProperty .
 
 
 ###  https://saref.etsi.org/saref4auto/consistsOfEntity
@@ -178,9 +170,8 @@
 <https://saref.etsi.org/saref4auto/isMemberOfPlatoon> rdf:type owl:ObjectProperty .
 
 
-
 #################################################################
-#    Data Properties
+#    Data properties
 #################################################################
 
 ###  http://www.w3.org/2003/01/geo/wgs84_pos#alt
@@ -198,11 +189,14 @@
 ###  http://www.w3.org/2006/time#inXSDDateTimeStamp
 <http://www.w3.org/2006/time#inXSDDateTimeStamp> rdf:type owl:DatatypeProperty .
 
+
 ###  https://saref.etsi.org/core/hasTimestamp
-<https://saref.etsi.org/core/hasTimestamp> rdf:type owl:DatatypeProperty .
+saref:hasTimestamp rdf:type owl:DatatypeProperty .
+
 
 ###  https://saref.etsi.org/core/hasValue
-<https://saref.etsi.org/core/hasValue> rdf:type owl:DatatypeProperty .
+saref:hasValue rdf:type owl:DatatypeProperty .
+
 
 ###  https://saref.etsi.org/saref4auto/hasConfidenceValue
 <https://saref.etsi.org/saref4auto/hasConfidenceValue> rdf:type owl:DatatypeProperty .
@@ -223,6 +217,7 @@
 ###  https://saref.etsi.org/saref4auto/hasIDValue
 <https://saref.etsi.org/saref4auto/hasIDValue> rdf:type owl:DatatypeProperty .
 
+
 ###  https://saref.etsi.org/saref4auto/hasMaxSize
 <https://saref.etsi.org/saref4auto/hasMaxSize> rdf:type owl:DatatypeProperty .
 
@@ -231,7 +226,6 @@
 <https://saref.etsi.org/saref4auto/hasPlatoonIndex> rdf:type owl:DatatypeProperty .
 
 
-
 #################################################################
 #    Classes
 #################################################################
@@ -245,7 +239,7 @@
 
 
 ###  https://saref.etsi.org/core/Measurement
-<https://saref.etsi.org/core/Measurement> rdf:type owl:Class .
+saref:Measurement rdf:type owl:Class .
 
 
 ###  https://saref.etsi.org/saref4auto/AbsolutePosition
@@ -420,6 +414,24 @@
 #    Individuals
 #################################################################
 
+###  http://www.ontology-of-units-of-measure.org/resource/om-2/kilometrePerHour
+om:kilometrePerHour rdf:type owl:NamedIndividual ,
+                             <https://saref.etsi.org/saref4auto/SpeedUnit> .
+
+
+###  http://www.ontology-of-units-of-measure.org/resource/om-2/metre
+om:metre rdf:type owl:NamedIndividual ,
+                  <https://saref.etsi.org/saref4auto/HeightUnit> ,
+                  <https://saref.etsi.org/saref4auto/LengthUnit> ,
+                  <https://saref.etsi.org/saref4auto/WidthUnit> .
+
+
+###  https://saref.etsi.org/saref4auto/example#platoon_cardinality
+:platoon_cardinality rdf:type owl:NamedIndividual ,
+                              <https://saref.etsi.org/saref4auto/CardinalityUnit> ;
+                     saref:isMeasuredIn :platoon_cardinality .
+
+
 ###  https://saref.etsi.org/saref4auto/example/Address1
 :Address1 rdf:type owl:NamedIndividual ,
                    <https://saref.etsi.org/saref4auto/Address> .
@@ -427,9 +439,9 @@
 
 ###  https://saref.etsi.org/saref4auto/example/Adult1Height_Meas
 :Adult1Height_Meas rdf:type owl:NamedIndividual ,
-                            <https://saref.etsi.org/core/Measurement> ;
-                   <https://saref.etsi.org/core/hasValue> 1.8 ;
-                   <https://saref.etsi.org/core/isMeasuredIn> :meter .
+                            saref:Measurement ;
+                   saref:isMeasuredIn om:metre ;
+                   saref:hasValue 1.8 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Adult1RelativePosition
@@ -444,16 +456,16 @@
 :BlackMoto rdf:type owl:NamedIndividual ,
                     <https://saref.etsi.org/saref4auto/P3-Motorcyclist> ;
            <https://saref.etsi.org/saref4auto/hasHeight> :Moto1Height ;
-           <https://saref.etsi.org/saref4auto/hasMovement> :static .
+           <https://saref.etsi.org/saref4auto/hasMovement> <https://saref.etsi.org/saref4auto/static> .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Car1
 :Car1 rdf:type owl:NamedIndividual ,
                <https://saref.etsi.org/saref4auto/Car> ;
-      <https://saref.etsi.org/core/hasProperty> :Car1Speed ,
-                                                :HeightCar1 ,
-                                                :LengthCar1 ,
-                                                :WidthCar1 ;
+      saref:hasProperty :Car1Speed ,
+                        :HeightCar1 ,
+                        :LengthCar1 ,
+                        :WidthCar1 ;
       <https://saref.etsi.org/saref4auto/hasAbsolutePosition> :Car1AbsolutePosition1 ;
       <https://saref.etsi.org/saref4auto/hasEnvironment> :Car1VehicleEnv ;
       <https://saref.etsi.org/saref4auto/hasIdentifier> :StationID1 ;
@@ -476,13 +488,13 @@
 ###  https://saref.etsi.org/saref4auto/example/Car1AtDropOffSpot1
 :Car1AtDropOffSpot1 rdf:type owl:NamedIndividual ,
                              <https://saref.etsi.org/saref4auto/AtDropOffSpot> ;
-                    <https://saref.etsi.org/core/hasTimestamp> "2020-04-08T14:02:10"^^xsd:dateTime .
+                    saref:hasTimestamp "2020-04-08T14:02:10"^^xsd:dateTime .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Car1DrivingToParkingSpot1
 :Car1DrivingToParkingSpot1 rdf:type owl:NamedIndividual ,
                                     <https://saref.etsi.org/saref4auto/DrivingToParkingSpot> ;
-                           <https://saref.etsi.org/core/hasTimestamp> "2020-04-08T14:04:00"^^xsd:dateTime .
+                           saref:hasTimestamp "2020-04-08T14:04:00"^^xsd:dateTime .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Car1DropOffPointParkingSpot1
@@ -500,28 +512,28 @@
 
 ###  https://saref.etsi.org/saref4auto/example/Car1Height_ManufacturerMeas
 :Car1Height_ManufacturerMeas rdf:type owl:NamedIndividual ,
-                                      <https://saref.etsi.org/core/Measurement> ;
-                             <https://saref.etsi.org/core/hasValue> 1.5 ;
-                             <https://saref.etsi.org/core/isMeasuredIn> :meter .
+                                      saref:Measurement ;
+                             saref:isMeasuredIn om:metre ;
+                             saref:hasValue 1.5 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Car1Length_ManufacturerMeas
 :Car1Length_ManufacturerMeas rdf:type owl:NamedIndividual ,
-                                      <https://saref.etsi.org/core/Measurement> ;
-                             <https://saref.etsi.org/core/hasValue> 3 ;
-                             <https://saref.etsi.org/core/isMeasuredIn> :meter .
+                                      saref:Measurement ;
+                             saref:isMeasuredIn om:metre ;
+                             saref:hasValue 3 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Car1ParkedInSpot1
 :Car1ParkedInSpot1 rdf:type owl:NamedIndividual ,
                             <https://saref.etsi.org/saref4auto/Parked> ;
-                   <https://saref.etsi.org/core/hasTimestamp> "2020-04-08T14:10:00"^^xsd:dateTime .
+                   saref:hasTimestamp "2020-04-08T14:10:00"^^xsd:dateTime .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Car1ParkingInSpot1
 :Car1ParkingInSpot1 rdf:type owl:NamedIndividual ,
                              <https://saref.etsi.org/saref4auto/Parking> ;
-                    <https://saref.etsi.org/core/hasTimestamp> "2020-04-08T14:07:00"^^xsd:dateTime .
+                    saref:hasTimestamp "2020-04-08T14:07:00"^^xsd:dateTime .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Car1ParkingSpot1Route
@@ -534,16 +546,16 @@
 ###  https://saref.etsi.org/saref4auto/example/Car1Speed
 :Car1Speed rdf:type owl:NamedIndividual ,
                     <https://saref.etsi.org/saref4auto/AbsoluteSpeed> ;
-           <https://saref.etsi.org/core/relatesToMeasurement> :Car1Speed_Meas1 .
+           saref:relatesToMeasurement :Car1Speed_Meas1 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Car1Speed_Meas1
 :Car1Speed_Meas1 rdf:type owl:NamedIndividual ,
-                          <https://saref.etsi.org/core/Measurement> ;
-                 <https://saref.etsi.org/core/hasTimestamp> "2020-04-15T11:45:24"^^xsd:dateTime ;
-                 <https://saref.etsi.org/core/hasValue> 100 ;
-                 <https://saref.etsi.org/core/isMeasuredIn> :km_per_hour ;
-                 <https://saref.etsi.org/saref4auto/hasConfidence> :Confidence1 .
+                          saref:Measurement ;
+                 saref:isMeasuredIn om:kilometrePerHour ;
+                 <https://saref.etsi.org/saref4auto/hasConfidence> :Confidence1 ;
+                 saref:hasTimestamp "2020-04-15T11:45:24"^^xsd:dateTime ;
+                 saref:hasValue 100 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Car1VehicleEnv
@@ -559,9 +571,9 @@
 
 ###  https://saref.etsi.org/saref4auto/example/Car1Width_ManufacturerMeas
 :Car1Width_ManufacturerMeas rdf:type owl:NamedIndividual ,
-                                     <https://saref.etsi.org/core/Measurement> ;
-                            <https://saref.etsi.org/core/hasValue> 1.475 ;
-                            <https://saref.etsi.org/core/isMeasuredIn> :meter .
+                                     saref:Measurement ;
+                            saref:isMeasuredIn om:metre ;
+                            saref:hasValue 1.475 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Car2
@@ -572,7 +584,7 @@
 
 ###  https://saref.etsi.org/saref4auto/example/Car2Height_ManufacturerMeas
 :Car2Height_ManufacturerMeas rdf:type owl:NamedIndividual ,
-                                      <https://saref.etsi.org/core/Measurement> .
+                                      saref:Measurement .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Car3
@@ -583,13 +595,13 @@
 
 ###  https://saref.etsi.org/saref4auto/example/Car3Height_ManufacturerMeas
 :Car3Height_ManufacturerMeas rdf:type owl:NamedIndividual ,
-                                      <https://saref.etsi.org/core/Measurement> .
+                                      saref:Measurement .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Car4CPS
 :Car4CPS rdf:type owl:NamedIndividual ,
                   <https://saref.etsi.org/saref4auto/Car> ;
-         <https://saref.etsi.org/core/hasProperty> :Car4CPSSpeed ;
+         saref:hasProperty :Car4CPSSpeed ;
          <https://saref.etsi.org/saref4auto/hasIdentifier> :StationID7 ;
          <https://saref.etsi.org/saref4auto/hasRelativePosition> :Car4CPSRelativePosition .
 
@@ -605,22 +617,22 @@
 ###  https://saref.etsi.org/saref4auto/example/Car4CPSSpeed
 :Car4CPSSpeed rdf:type owl:NamedIndividual ,
                        <https://saref.etsi.org/saref4auto/AbsoluteSpeed> ;
-              <https://saref.etsi.org/core/relatesToMeasurement> :Car4CPSSpeed_Meas1 .
+              saref:relatesToMeasurement :Car4CPSSpeed_Meas1 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Car4CPSSpeed_Meas1
 :Car4CPSSpeed_Meas1 rdf:type owl:NamedIndividual ,
-                             <https://saref.etsi.org/core/Measurement> ;
-                    <https://saref.etsi.org/core/hasTimestamp> "2020-04-15T11:45:24"^^xsd:dateTime ;
-                    <https://saref.etsi.org/core/hasValue> 20 ;
-                    <https://saref.etsi.org/core/isMeasuredIn> :km_per_hour .
+                             saref:Measurement ;
+                    saref:isMeasuredIn om:kilometrePerHour ;
+                    saref:hasTimestamp "2020-04-15T11:45:24"^^xsd:dateTime ;
+                    saref:hasValue 20 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Child1Height_Meas
 :Child1Height_Meas rdf:type owl:NamedIndividual ,
-                            <https://saref.etsi.org/core/Measurement> ;
-                   <https://saref.etsi.org/core/hasValue> 1.2 ;
-                   <https://saref.etsi.org/core/isMeasuredIn> :meter .
+                            saref:Measurement ;
+                   saref:isMeasuredIn om:metre ;
+                   saref:hasValue 1.2 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Child1RelativePosition
@@ -634,14 +646,14 @@
 ###  https://saref.etsi.org/saref4auto/example/Confidence1
 :Confidence1 rdf:type owl:NamedIndividual ,
                       <https://saref.etsi.org/saref4auto/SpeedConfidence> ;
-             <https://saref.etsi.org/core/hasConfidenceUnitOfMeasure> :km_per_hour ;
+             saref:hasConfidenceUnitOfMeasure om:kilometrePerHour ;
              <https://saref.etsi.org/saref4auto/hasConfidenceValue> 3 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/EnvironmentDetected
 :EnvironmentDetected rdf:type owl:NamedIndividual ,
                               <https://saref.etsi.org/saref4auto/PerceptionState> ;
-                     <https://saref.etsi.org/core/hasTimestamp> "2020-04-15T11:45:24"^^xsd:dateTime .
+                     saref:hasTimestamp "2020-04-15T11:45:24"^^xsd:dateTime .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Event1RelativePosition
@@ -655,7 +667,7 @@
 ###  https://saref.etsi.org/saref4auto/example/HeightCar1
 :HeightCar1 rdf:type owl:NamedIndividual ,
                      <https://saref.etsi.org/saref4auto/Height> ;
-            <https://saref.etsi.org/core/relatesToMeasurement> :Car1Height_ManufacturerMeas .
+            saref:relatesToMeasurement :Car1Height_ManufacturerMeas .
 
 
 ###  https://saref.etsi.org/saref4auto/example/HeightCar2
@@ -671,7 +683,7 @@
 ###  https://saref.etsi.org/saref4auto/example/HeightTruck1
 :HeightTruck1 rdf:type owl:NamedIndividual ,
                        <https://saref.etsi.org/saref4auto/Height> ;
-              <https://saref.etsi.org/core/relatesToMeasurement> :Truck1Heigth_ManufacturerMeas .
+              saref:relatesToMeasurement :Truck1Heigth_ManufacturerMeas .
 
 
 ###  https://saref.etsi.org/saref4auto/example/HeightTruck2
@@ -687,7 +699,7 @@
 ###  https://saref.etsi.org/saref4auto/example/LengthCar1
 :LengthCar1 rdf:type owl:NamedIndividual ,
                      <https://saref.etsi.org/saref4auto/Length> ;
-            <https://saref.etsi.org/core/relatesToMeasurement> :Car1Length_ManufacturerMeas .
+            saref:relatesToMeasurement :Car1Length_ManufacturerMeas .
 
 
 ###  https://saref.etsi.org/saref4auto/example/LengthCar2
@@ -703,7 +715,7 @@
 ###  https://saref.etsi.org/saref4auto/example/LengthTruck1
 :LengthTruck1 rdf:type owl:NamedIndividual ,
                        <https://saref.etsi.org/saref4auto/Length> ;
-              <https://saref.etsi.org/core/relatesToMeasurement> :Truck1Length_ManufacturerMeas .
+              saref:relatesToMeasurement :Truck1Length_ManufacturerMeas .
 
 
 ###  https://saref.etsi.org/saref4auto/example/LengthTruck2
@@ -719,14 +731,14 @@
 ###  https://saref.etsi.org/saref4auto/example/Moto1Height
 :Moto1Height rdf:type owl:NamedIndividual ,
                       <https://saref.etsi.org/saref4auto/Height> ;
-             <https://saref.etsi.org/core/relatesToMeasurement> :Moto1Height_Meas .
+             saref:relatesToMeasurement :Moto1Height_Meas .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Moto1Height_Meas
 :Moto1Height_Meas rdf:type owl:NamedIndividual ,
-                           <https://saref.etsi.org/core/Measurement> ;
-                  <https://saref.etsi.org/core/hasValue> 1.3 ;
-                  <https://saref.etsi.org/core/isMeasuredIn> :meter .
+                           saref:Measurement ;
+                  saref:isMeasuredIn om:metre ;
+                  saref:hasValue 1.3 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Moto1RelativePosition
@@ -756,13 +768,13 @@
 ###  https://saref.etsi.org/saref4auto/example/ParkingSpot1Free
 :ParkingSpot1Free rdf:type owl:NamedIndividual ,
                            <https://saref.etsi.org/saref4auto/Free> ;
-                  <https://saref.etsi.org/core/hasTimestamp> "2020-04-08T14:00:00"^^xsd:dateTime .
+                  saref:hasTimestamp "2020-04-08T14:00:00"^^xsd:dateTime .
 
 
 ###  https://saref.etsi.org/saref4auto/example/ParkingSpot1Occupied
 :ParkingSpot1Occupied rdf:type owl:NamedIndividual ,
                                <https://saref.etsi.org/saref4auto/Occupied> ;
-                      <https://saref.etsi.org/core/hasTimestamp> "2020-04-08T14:07:00"^^xsd:dateTime .
+                      saref:hasTimestamp "2020-04-08T14:07:00"^^xsd:dateTime .
 
 
 ###  https://saref.etsi.org/saref4auto/example/ParkingSpot1OpeningTime
@@ -788,20 +800,20 @@
 ###  https://saref.etsi.org/saref4auto/example/ParkingSpot1Reserved
 :ParkingSpot1Reserved rdf:type owl:NamedIndividual ,
                                <https://saref.etsi.org/saref4auto/Reserved> ;
-                      <https://saref.etsi.org/core/hasTimestamp> "2020-04-08T14:03:00"^^xsd:dateTime .
+                      saref:hasTimestamp "2020-04-08T14:03:00"^^xsd:dateTime .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Platoon1
 :Platoon1 rdf:type owl:NamedIndividual ,
                    <https://saref.etsi.org/saref4auto/Platoon> ;
-          <https://saref.etsi.org/core/hasProperty> :Platoon1Size ;
+          saref:hasProperty :Platoon1Size ;
           <https://saref.etsi.org/saref4auto/hasDestinationEndPoint> :Platoon1EndPoint ;
-          <https://saref.etsi.org/saref4auto/hasMaxSize> 6 ;
           <https://saref.etsi.org/saref4auto/hasPlatoonMember> :Truck1 ,
                                                                :Truck2 ,
                                                                :Truck3 ;
-          <https://saref.etsi.org/saref4auto/hasPlatoonState> <https://etsi.saref.org/saref4auto/Platoon1Platooning> ,
-                                                              :Platoon1Unknown .
+          <https://saref.etsi.org/saref4auto/hasPlatoonState> :Platoon1Platooning ,
+                                                              :Platoon1Unknown ;
+          <https://saref.etsi.org/saref4auto/hasMaxSize> 6 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Platoon1EndPoint
@@ -814,30 +826,31 @@
 :Platoon1Platooning rdf:type owl:NamedIndividual ,
                              <https://saref.etsi.org/saref4auto/PlatoonVehicleState> ,
                              <https://saref.etsi.org/saref4auto/Platooning> ;
-                    <https://saref.etsi.org/core/hasTimestamp> "2020-02-02T19:01:00"^^xsd:dateTime ,
-                                                               "2020-02-02T19:04:50"^^xsd:dateTime ,
-                                                               "2020-02-02T19:16:38"^^xsd:dateTime .
+                    saref:hasTimestamp "2020-02-02T19:01:00"^^xsd:dateTime ,
+                                       "2020-02-02T19:04:50"^^xsd:dateTime ,
+                                       "2020-02-02T19:16:38"^^xsd:dateTime .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Platoon1Size
 :Platoon1Size rdf:type owl:NamedIndividual ,
                        <https://saref.etsi.org/saref4auto/Size> ;
-              <https://saref.etsi.org/core/relatesToMeasurement> :Platoon1Size_Meas1 .
+              saref:relatesToMeasurement :Platoon1Size_Meas1 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Platoon1Size_Meas1
 :Platoon1Size_Meas1 rdf:type owl:NamedIndividual ,
-                             <https://saref.etsi.org/core/Measurement> ;
-                    <https://saref.etsi.org/core/hasTimestamp> "2020-02-02T18:45:35"^^xsd:dateTime ;
-                    <https://saref.etsi.org/core/hasValue> 2 .
+                             saref:Measurement ;
+                    saref:isMeasuredIn :platoon_cardinality ;
+                    saref:hasTimestamp "2020-02-02T18:45:35"^^xsd:dateTime ;
+                    saref:hasValue 2 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Platoon1Unknown
 :Platoon1Unknown rdf:type owl:NamedIndividual ,
                           <https://saref.etsi.org/saref4auto/PlatoonVehicleState> ,
                           <https://saref.etsi.org/saref4auto/Unknown> ;
-                 rdfs:label "unknown"@en ;
-                 <https://saref.etsi.org/core/hasTimestamp> "2020-02-02T18:48:15"^^xsd:dateTime .
+                 saref:hasTimestamp "2020-02-02T18:48:15"^^xsd:dateTime ;
+                 rdfs:label "unknown"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/example/PlatoonID1
@@ -866,9 +879,9 @@
 
 ###  https://saref.etsi.org/saref4auto/example/PlatoonSize_Meas2
 :PlatoonSize_Meas2 rdf:type owl:NamedIndividual ,
-                            <https://saref.etsi.org/core/Measurement> ;
-                   <https://saref.etsi.org/core/hasTimestamp> "2020-02-02T19:00:00"^^xsd:dateTime ;
-                   <https://saref.etsi.org/core/hasValue> "3"^^xsd:int .
+                            saref:Measurement ;
+                   saref:hasTimestamp "2020-02-02T19:00:00"^^xsd:dateTime ;
+                   saref:hasValue "3"^^xsd:int .
 
 
 ###  https://saref.etsi.org/saref4auto/example/RoadConeObject
@@ -950,9 +963,9 @@
 ###  https://saref.etsi.org/saref4auto/example/Truck1
 :Truck1 rdf:type owl:NamedIndividual ,
                  <https://saref.etsi.org/saref4auto/Truck> ;
-        <https://saref.etsi.org/core/hasProperty> :HeightTruck1 ,
-                                                  :LengthTruck1 ,
-                                                  :WidthTruck1 ;
+        saref:hasProperty :HeightTruck1 ,
+                          :LengthTruck1 ,
+                          :WidthTruck1 ;
         <https://saref.etsi.org/saref4auto/hasIdentifier> :StationID4 ;
         <https://saref.etsi.org/saref4auto/hasPlatoonPosition> :PlatoonPosition1 ;
         <https://saref.etsi.org/saref4auto/hasPlatoonRole> <https://saref.etsi.org/saref4auto/leader> ;
@@ -968,16 +981,16 @@
 
 ###  https://saref.etsi.org/saref4auto/example/Truck1Heigth_ManufacturerMeas
 :Truck1Heigth_ManufacturerMeas rdf:type owl:NamedIndividual ,
-                                        <https://saref.etsi.org/core/Measurement> ;
-                               <https://saref.etsi.org/core/hasValue> 2.45 ;
-                               <https://saref.etsi.org/core/isMeasuredIn> :meter .
+                                        saref:Measurement ;
+                               saref:isMeasuredIn om:metre ;
+                               saref:hasValue 2.45 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Truck1Length_ManufacturerMeas
 :Truck1Length_ManufacturerMeas rdf:type owl:NamedIndividual ,
-                                        <https://saref.etsi.org/core/Measurement> ;
-                               <https://saref.etsi.org/core/hasValue> 13 ;
-                               <https://saref.etsi.org/core/isMeasuredIn> :meter .
+                                        saref:Measurement ;
+                               saref:isMeasuredIn om:metre ;
+                               saref:hasValue 13 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Truck1Route
@@ -988,9 +1001,9 @@
 
 ###  https://saref.etsi.org/saref4auto/example/Truck1Width_ManufacturerMeas
 :Truck1Width_ManufacturerMeas rdf:type owl:NamedIndividual ,
-                                       <https://saref.etsi.org/core/Measurement> ;
-                              <https://saref.etsi.org/core/hasValue> 2.45 ;
-                              <https://saref.etsi.org/core/isMeasuredIn> :meter .
+                                       saref:Measurement ;
+                              saref:isMeasuredIn om:metre ;
+                              saref:hasValue 2.45 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Truck2
@@ -1013,7 +1026,7 @@
 ###  https://saref.etsi.org/saref4auto/example/Truck4CPS
 :Truck4CPS rdf:type owl:NamedIndividual ,
                     <https://saref.etsi.org/saref4auto/Truck> ;
-           <https://saref.etsi.org/core/hasProperty> :Truck4CPSSpeed ;
+           saref:hasProperty :Truck4CPSSpeed ;
            <https://saref.etsi.org/saref4auto/hasIdentifier> :StationID8 ;
            <https://saref.etsi.org/saref4auto/hasRelativePosition> :Truck4CPSRelativePosition .
 
@@ -1029,21 +1042,21 @@
 ###  https://saref.etsi.org/saref4auto/example/Truck4CPSSpeed
 :Truck4CPSSpeed rdf:type owl:NamedIndividual ,
                          <https://saref.etsi.org/saref4auto/AbsoluteSpeed> ;
-                <https://saref.etsi.org/core/relatesToMeasurement> :Truck4CPSSpeed_Meas1 .
+                saref:relatesToMeasurement :Truck4CPSSpeed_Meas1 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Truck4CPSSpeed_Meas1
 :Truck4CPSSpeed_Meas1 rdf:type owl:NamedIndividual ,
-                               <https://saref.etsi.org/core/Measurement> ;
-                      <https://saref.etsi.org/core/hasTimestamp> "2020-04-15T11:45:24"^^xsd:dateTime ;
-                      <https://saref.etsi.org/core/hasValue> 0 ;
-                      <https://saref.etsi.org/core/isMeasuredIn> :km_per_hour .
+                               saref:Measurement ;
+                      saref:isMeasuredIn om:kilometrePerHour ;
+                      saref:hasTimestamp "2020-04-15T11:45:24"^^xsd:dateTime ;
+                      saref:hasValue 0 .
 
 
 ###  https://saref.etsi.org/saref4auto/example/WidthCar1
 :WidthCar1 rdf:type owl:NamedIndividual ,
                     <https://saref.etsi.org/saref4auto/Width> ;
-           <https://saref.etsi.org/core/relatesToMeasurement> :Car1Width_ManufacturerMeas .
+           saref:relatesToMeasurement :Car1Width_ManufacturerMeas .
 
 
 ###  https://saref.etsi.org/saref4auto/example/WidthCar2
@@ -1059,7 +1072,7 @@
 ###  https://saref.etsi.org/saref4auto/example/WidthTruck1
 :WidthTruck1 rdf:type owl:NamedIndividual ,
                       <https://saref.etsi.org/saref4auto/Width> ;
-             <https://saref.etsi.org/core/relatesToMeasurement> :Truck1Width_ManufacturerMeas .
+             saref:relatesToMeasurement :Truck1Width_ManufacturerMeas .
 
 
 ###  https://saref.etsi.org/saref4auto/example/WidthTruck2
@@ -1082,7 +1095,7 @@
 ###  https://saref.etsi.org/saref4auto/example/adult1Height
 :adult1Height rdf:type owl:NamedIndividual ,
                        <https://saref.etsi.org/saref4auto/Height> ;
-              <https://saref.etsi.org/core/relatesToMeasurement> :Adult1Height_Meas .
+              saref:relatesToMeasurement :Adult1Height_Meas .
 
 
 ###  https://saref.etsi.org/saref4auto/example/child1
@@ -1095,7 +1108,7 @@
 ###  https://saref.etsi.org/saref4auto/example/child1Height
 :child1Height rdf:type owl:NamedIndividual ,
                        <https://saref.etsi.org/saref4auto/Height> ;
-              <https://saref.etsi.org/core/relatesToMeasurement> :Child1Height_Meas .
+              saref:relatesToMeasurement :Child1Height_Meas .
 
 
 ###  https://saref.etsi.org/saref4auto/example/cone
@@ -1108,16 +1121,4 @@
                                  <https://saref.etsi.org/saref4auto/NotifiedEvent> .
 
 
-###  https://saref.etsi.org/saref4auto/example/km_per_hour
-:km_per_hour rdf:type owl:NamedIndividual ,
-                      <https://saref.etsi.org/saref4auto/SpeedUnit> .
-
-
-###  https://saref.etsi.org/saref4auto/example/meter
-:meter rdf:type owl:NamedIndividual ,
-                <https://saref.etsi.org/saref4auto/HeightUnit> ,
-                <https://saref.etsi.org/saref4auto/LengthUnit> ,
-                <https://saref.etsi.org/saref4auto/WidthUnit> .
-
-
 ###  Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi