diff --git a/documentation/Mapping-2023-2025-draft.drawio b/documentation/Mapping-2023-2025-draft.drawio
index 3cce336..78fa48b 100644
--- a/documentation/Mapping-2023-2025-draft.drawio
+++ b/documentation/Mapping-2023-2025-draft.drawio
@@ -1,10 +1,10 @@
 <mxfile host="Electron" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.7.17 Chrome/128.0.6613.36 Electron/32.0.1 Safari/537.36" version="24.7.17">
   <diagram name="Seite-1" id="O8GddWhcbF4NDvKM5EmY">
-    <mxGraphModel dx="3907" dy="1596" 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="2309" dy="878" 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="hMvtFYx8mkaiVF-YGMAp-4" value="removed" style="whiteSpace=wrap;strokeWidth=2;align=center;spacingLeft=20;verticalAlign=top;fontStyle=0;fontSize=21;fillColor=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
+        <mxCell id="hMvtFYx8mkaiVF-YGMAp-4" value="removed" style="whiteSpace=wrap;strokeWidth=2;align=center;spacingLeft=20;verticalAlign=top;fontStyle=0;fontSize=21;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
           <mxGeometry x="-440" y="541.5" width="380" height="110" as="geometry" />
         </mxCell>
         <mxCell id="wD6HdIPCGLci8Dcnv06h-11" value="" style="whiteSpace=wrap;html=1;align=center;horizontal=1;verticalAlign=top;fontSize=21;movable=1;resizable=1;rotatable=1;deletable=1;editable=1;locked=0;connectable=1;" parent="1" vertex="1">
@@ -124,7 +124,7 @@
         <mxCell id="lPej12Bno3lJLsPGT7YB-174" value="LG 01-06: Relate the Role of Software Architects to Other Stakeholders" style="whiteSpace=wrap;strokeWidth=2;align=left;spacingLeft=20;" parent="1" vertex="1">
           <mxGeometry x="912" y="526.5" width="456.5" height="51" as="geometry" />
         </mxCell>
-        <mxCell id="lPej12Bno3lJLsPGT7YB-175" value="LG 01-07: Importance and Design of Data Models" style="whiteSpace=wrap;strokeWidth=2;align=left;spacingLeft=20;" parent="1" vertex="1">
+        <mxCell id="lPej12Bno3lJLsPGT7YB-175" value="LG 01-07: Importance and Design of Data and Data Models" style="whiteSpace=wrap;strokeWidth=2;align=left;spacingLeft=20;" parent="1" vertex="1">
           <mxGeometry x="912" y="599.5" width="456.5" height="51" as="geometry" />
         </mxCell>
         <mxCell id="lPej12Bno3lJLsPGT7YB-176" value="LG 02-01: Understand Stakeholder Concerns" style="whiteSpace=wrap;strokeWidth=2;align=left;spacingLeft=20;" parent="1" vertex="1">
@@ -280,7 +280,7 @@
             <mxPoint x="1373" y="640.5" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="lPej12Bno3lJLsPGT7YB-232" value="" style="startArrow=none;endArrow=block;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="1" target="lPej12Bno3lJLsPGT7YB-175" edge="1" source="lPej12Bno3lJLsPGT7YB-209">
+        <mxCell id="lPej12Bno3lJLsPGT7YB-232" value="" style="startArrow=none;endArrow=block;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="lPej12Bno3lJLsPGT7YB-209" target="lPej12Bno3lJLsPGT7YB-175" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="1463" y="640.5" as="sourcePoint" />
             <mxPoint x="1373" y="645.5" as="targetPoint" />
@@ -682,23 +682,23 @@
         <mxCell id="wD6HdIPCGLci8Dcnv06h-64" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
           <mxGeometry x="911" y="3154" width="17" height="50" as="geometry" />
         </mxCell>
-        <mxCell id="hMvtFYx8mkaiVF-YGMAp-1" value="LG 01-03: Understand the Long-Term Impact of Software Architecture" style="whiteSpace=wrap;strokeWidth=2;align=left;spacingLeft=20;" vertex="1" parent="1">
+        <mxCell id="hMvtFYx8mkaiVF-YGMAp-1" value="LG 01-03: Understand the Long-Term Impact of Software Architecture" style="whiteSpace=wrap;strokeWidth=2;align=left;spacingLeft=20;" parent="1" vertex="1">
           <mxGeometry x="911" y="314" width="456.5" height="51" as="geometry" />
         </mxCell>
-        <mxCell id="hMvtFYx8mkaiVF-YGMAp-2" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" vertex="1" parent="1">
+        <mxCell id="hMvtFYx8mkaiVF-YGMAp-2" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
           <mxGeometry x="912" y="314" width="17" height="50" as="geometry" />
         </mxCell>
-        <mxCell id="hMvtFYx8mkaiVF-YGMAp-3" value="" style="curved=1;startArrow=none;endArrow=block;rounded=0;" edge="1" parent="1">
+        <mxCell id="hMvtFYx8mkaiVF-YGMAp-3" value="" style="curved=1;startArrow=none;endArrow=block;rounded=0;" parent="1" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points" />
             <mxPoint x="500" y="340" as="sourcePoint" />
             <mxPoint x="913" y="340" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="hMvtFYx8mkaiVF-YGMAp-5" value="Data" style="whiteSpace=wrap;strokeWidth=2;" vertex="1" parent="1">
+        <mxCell id="hMvtFYx8mkaiVF-YGMAp-5" value="Data" style="whiteSpace=wrap;strokeWidth=2;" parent="1" vertex="1">
           <mxGeometry x="1456" y="655" width="175" height="39" as="geometry" />
         </mxCell>
-        <mxCell id="hMvtFYx8mkaiVF-YGMAp-6" value="" style="startArrow=none;endArrow=block;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="hMvtFYx8mkaiVF-YGMAp-5" target="lPej12Bno3lJLsPGT7YB-175">
+        <mxCell id="hMvtFYx8mkaiVF-YGMAp-6" value="" style="startArrow=none;endArrow=block;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="hMvtFYx8mkaiVF-YGMAp-5" target="lPej12Bno3lJLsPGT7YB-175" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="1466" y="700" as="sourcePoint" />
             <mxPoint x="1379" y="635" as="targetPoint" />
diff --git a/documentation/Mapping-2023-2025-draft.drawio.png b/documentation/Mapping-2023-2025-draft.drawio.png
index 02c72d3..85cb631 100644
Binary files a/documentation/Mapping-2023-2025-draft.drawio.png and b/documentation/Mapping-2023-2025-draft.drawio.png differ