diff --git a/documentation/diagrams/Overview.png b/documentation/diagrams/Overview.png
index 10f6d3b3fe4a99f981a38ff179b202cd95e9b74b..196dd76afd0731face116bc8654ddc7244df109f 100644
Binary files a/documentation/diagrams/Overview.png and b/documentation/diagrams/Overview.png differ
diff --git a/documentation/diagrams/Property.png b/documentation/diagrams/Property.png
index e7b5eea1c4f491b21266f6020f7dc76ce72a0d93..13f5a83b372c9dd0d673ada471456c9ff726ec2a 100644
Binary files a/documentation/diagrams/Property.png and b/documentation/diagrams/Property.png differ
diff --git a/documentation/diagrams/overview.drawio b/documentation/diagrams/overview.drawio
index 018a3a82619b5f031aad5adb69b4a4a9d2ef5cc2..1cc9ae79a495988de0ca187ccd24b86493f60551 100644
--- a/documentation/diagrams/overview.drawio
+++ b/documentation/diagrams/overview.drawio
@@ -1,16 +1,16 @@
-<mxfile host="Electron" modified="2024-07-10T13:01:21.859Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.5.3 Chrome/124.0.6367.207 Electron/30.0.6 Safari/537.36" etag="IlTR9aOgXD2ow5WUhEQC" version="24.5.3" type="device" pages="9">
+<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" version="24.8.4" pages="9">
   <diagram id="VPhGmmsqynnscywGstpF" name="SAREF4MARI">
-    <mxGraphModel dx="3055" dy="2495" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="2022" dy="1912" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="SG2_NnlKsxN5cYcAdMtR-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.75;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;" edge="1" parent="1" source="1FtHFo_rNsmZQKpqGKMX-431" target="1FtHFo_rNsmZQKpqGKMX-29">
+        <mxCell id="SG2_NnlKsxN5cYcAdMtR-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.75;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;" parent="1" source="1FtHFo_rNsmZQKpqGKMX-431" target="1FtHFo_rNsmZQKpqGKMX-29" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="1739" y="-773" as="sourcePoint" />
             <mxPoint x="499" y="-911" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="SG2_NnlKsxN5cYcAdMtR-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;" edge="1" parent="1" source="1FtHFo_rNsmZQKpqGKMX-416" target="1FtHFo_rNsmZQKpqGKMX-29">
+        <mxCell id="SG2_NnlKsxN5cYcAdMtR-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;" parent="1" source="1FtHFo_rNsmZQKpqGKMX-416" target="1FtHFo_rNsmZQKpqGKMX-29" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="619" y="-845" as="sourcePoint" />
             <mxPoint x="584" y="-870" as="targetPoint" />
@@ -2891,15 +2891,15 @@
             <mxPoint x="2970" y="-603" as="sourcePoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="2pH5VFnU49YfXjEHHY0h-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;" edge="1" parent="1" source="2pH5VFnU49YfXjEHHY0h-2" target="1FtHFo_rNsmZQKpqGKMX-51">
+        <mxCell id="2pH5VFnU49YfXjEHHY0h-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;" parent="1" source="2pH5VFnU49YfXjEHHY0h-2" target="1FtHFo_rNsmZQKpqGKMX-51" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="-231" y="-962" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="2pH5VFnU49YfXjEHHY0h-2" value="s4mari:MaritimeObjectProperty" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="1">
+        <mxCell id="2pH5VFnU49YfXjEHHY0h-2" value="s4mari:MaritimeObjectProperty" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="1" vertex="1">
           <mxGeometry x="-210" y="-910.5200000000001" width="190.5" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="SG2_NnlKsxN5cYcAdMtR-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;exitX=0.25;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="1FtHFo_rNsmZQKpqGKMX-408" target="1FtHFo_rNsmZQKpqGKMX-29">
+        <mxCell id="SG2_NnlKsxN5cYcAdMtR-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.25;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=0;jumpStyle=arc;exitX=0.25;exitY=0;exitDx=0;exitDy=0;" parent="1" source="1FtHFo_rNsmZQKpqGKMX-408" target="1FtHFo_rNsmZQKpqGKMX-29" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="1600" y="410" as="sourcePoint" />
             <mxPoint x="509" y="-901" as="targetPoint" />
@@ -2909,6 +2909,44 @@
             </Array>
           </mxGeometry>
         </mxCell>
+        <mxCell id="4ssgpzwcUSAD8wTdgtnd-1" value="&lt;u&gt;s4mari:Heading&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;dashed=1;" vertex="1" parent="1">
+          <mxGeometry x="-210" y="490" width="229.75" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="4ssgpzwcUSAD8wTdgtnd-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=classic;endFill=1;dashed=1;jumpStyle=arc;" edge="1" parent="1">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="-210" y="505" as="sourcePoint" />
+            <mxPoint x="-230" y="-920" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="-230" y="505" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="4ssgpzwcUSAD8wTdgtnd-3" value="&lt;u&gt;s4mari:Pitch&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;dashed=1;" vertex="1" parent="1">
+          <mxGeometry x="-210" y="529.86" width="229.75" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="4ssgpzwcUSAD8wTdgtnd-4" value="&lt;u&gt;s4mari:Roll&lt;/u&gt;" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;dashed=1;" vertex="1" parent="1">
+          <mxGeometry x="-210" y="570" width="229.75" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="4ssgpzwcUSAD8wTdgtnd-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=classic;endFill=1;dashed=1;jumpStyle=arc;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="4ssgpzwcUSAD8wTdgtnd-3">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="-280" y="540.62" as="sourcePoint" />
+            <mxPoint x="-230" y="-920" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="-230" y="545" />
+              <mxPoint x="-230" y="-884" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="4ssgpzwcUSAD8wTdgtnd-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=classic;endFill=1;dashed=1;jumpStyle=arc;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="4ssgpzwcUSAD8wTdgtnd-4">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="-250.75" y="570" as="sourcePoint" />
+            <mxPoint x="-230" y="-920" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="-230" y="585" />
+              <mxPoint x="-230" y="-895" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
diff --git a/examples/example1.ttl b/examples/example1.ttl
deleted file mode 100644
index c2328b903c73d03c8f8481a675c4300cf0a0b010..0000000000000000000000000000000000000000
--- a/examples/example1.ttl
+++ /dev/null
@@ -1,23 +0,0 @@
-@prefix dcterms: <http://purl.org/dc/terms/> .
-@prefix dctype: <http://purl.org/dc/dcmitype/> .
-@prefix ex: <https://saref.etsi.org/saref4mari/v1.1.1/example/example1/> .
-@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
-@prefix geosp: <http://www.opengis.net/ont/geosparql#> .
-@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 rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix s4mari: <https://saref.etsi.org/saref4mari/> .
-@prefix saref: <https://saref.etsi.org/core/> .
-@prefix sosa: <http://www.w3.org/ns/sosa/> .
-@prefix ssn: <http://www.w3.org/ns/ssn/> .
-@prefix time: <http://www.w3.org/2006/time#> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-
-<https://saref.etsi.org/saref4mari/v1.1.1/example/example1#> a dctype:Dataset ;
-  dcterms:license <https://forge.etsi.org/etsi-software-license> ;
-  dcterms:conformsTo <https://saref.etsi.org/core/v3.2.1/> ;
-  dcterms:conformsTo <https://saref.etsi.org/saref4mari/v1.1.1/> ;
-  dcterms:title "SAREF4MARI example number 1."@en ;
-  dcterms:description "SAREF4MARI example number 1."@en .
-