diff --git a/doc/edm4hep_diagram.svg b/doc/edm4hep_diagram.svg
index 9c00daac7..71aa03fdd 100644
--- a/doc/edm4hep_diagram.svg
+++ b/doc/edm4hep_diagram.svg
@@ -24,12 +24,12 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1920"
-     inkscape:window-height="1136"
+     inkscape:window-height="1016"
      id="namedview332"
      showgrid="true"
-     inkscape:zoom="1.2210628"
-     inkscape:cx="664.99446"
-     inkscape:cy="411.52674"
+     inkscape:zoom="0.86342179"
+     inkscape:cx="776.56136"
+     inkscape:cy="422.15752"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
@@ -1165,8 +1165,8 @@
        style="color-interpolation-filters:sRGB"
        id="filter6544-3"
        height="1.0105024"
-       width="1.0010917"
-       x="-0.00054584329"
+       width="1.0013339"
+       x="-0.00066693183"
        y="-0.0052512013">
       <feOffset
          dy="0"
@@ -1494,6 +1494,18 @@
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
          id="path4629-7-75-0-6" />
     </marker>
+    <marker
+       style="overflow:visible"
+       id="Arrow2Lend-9-6-8"
+       refX="0"
+       refY="0"
+       orient="auto">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path4629-7-75-7" />
+    </marker>
   </defs>
   <metadata
      id="metadata5">
@@ -1524,6 +1536,12 @@
      y="0.13759796"
      ry="2.7425931e-06"
      rx="0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:0.185208;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend-9-6-8)"
+     d="m 255.32292,31.75 -6.61459,38.364583"
+     id="path6614-2-1-9"
+     sodipodi:nodetypes="cc" />
   <rect
      style="opacity:0.68500001;fill:#decd87;stroke:#445500;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none"
      id="rect9855-9"
@@ -1671,7 +1689,7 @@
          x="130.28593"
          y="7.5458164"
          style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.76111px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Italic';text-align:center;text-anchor:middle;stroke-width:0.264583"
-         id="tspan2610">EDM4hep DataModel Overview (v0.10)</tspan></tspan></text>
+         id="tspan2610">EDM4hep DataModel Overview (v0.99)</tspan></tspan></text>
   <text
      xml:space="preserve"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5833px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.264583"
@@ -2120,25 +2138,6 @@
          y="30.716194"
          id="tspan2560"
          style="stroke-width:0.155587">ParticleID</tspan></tspan></text>
-  <g
-     id="g4079"
-     transform="matrix(0.57501552,0,0,0.70151281,-114.52136,-3.043978)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path6614-2-5-0-9-0-94"
-       d="M 615.276,68.135417 638.07437,53.048973"
-       style="fill:none;stroke:#000000;stroke-width:0.21700881px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-9-9-9-4-2-1)" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path6614-2-5-0-3-2-5-9"
-       d="M 615.276,68.135417 634.90844,53.406026"
-       style="fill:none;stroke:#000000;stroke-width:0.21700881px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-9-9-9-6-4-3-6)" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path6614-2-5-0-1-0-8-1"
-       d="m 615.276,68.135417 16.64331,-14.56917"
-       style="fill:none;stroke:#000000;stroke-width:0.21700881px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-9-9-9-5-7-3-6)" />
-  </g>
   <g
      id="g3611"
      transform="translate(0,-5.1267494)">
@@ -2267,28 +2266,6 @@
          y="32.237076"
          style="font-size:4.21618px;fill:#0000ff;stroke-width:0.161093"
          id="tspan2554-1-9">MCRecoCaloAssociation</tspan></tspan></text>
-  <g
-     id="g31242-2"
-     transform="rotate(39.070948,459.16238,-435.97668)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path6614-2-5-0-9-9"
-       d="M 611.98125,91.154167 601.94302,59.592374"
-       style="fill:none;stroke:#000000;stroke-width:0.21700881px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-9-9-9-4-3)"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path6614-2-5-0-3-2-1"
-       d="M 611.98125,91.154167 599.51987,58.851607"
-       style="fill:none;stroke:#000000;stroke-width:0.21700881px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-9-9-9-6-4-7)"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path6614-2-5-0-1-0-2"
-       d="M 611.98125,91.154167 596.92491,57.810916"
-       style="fill:none;stroke:#000000;stroke-width:0.21700881px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-9-9-9-5-7-35)"
-       sodipodi:nodetypes="cc" />
-  </g>
   <text
      xml:space="preserve"
      style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.2235px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.155587;filter:url(#filter6544-3)"
@@ -2346,4 +2323,10 @@
      d="M 70.128124,79.526432 216.54323,98.523803"
      id="path7862-8-7-8-8"
      sodipodi:nodetypes="cc" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:0.185208;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend-9-6-8)"
+     d="m 255.32292,31.75 -6.61459,38.364583"
+     id="path21996"
+     sodipodi:nodetypes="cc" />
 </svg>