diff --git a/VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram b/VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram
index b9dd7747f806a13cd8d4e051ee4014e0b5050a12..889fce8028d4a091fcf28051941f617d0485842c 100644
--- a/VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram
+++ b/VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram
@@ -11037,172 +11037,6 @@
           </stereotypeInstance>
         </appliedStereotypesInternal>
         <elementDefinition Id="fcad8ea5-8fd5-485d-81e2-eff3f6888981" />
-        <targetEnds>
-          <association Id="b6aac638-0738-48de-96d2-dffb9428059e" isDerived="false" sourceEndRoleName="VectoRunData" targetEndRoleName="VehicleData" isLeaf="false" isAbstract="false">
-            <classMoniker Id="3a121d7b-4cfc-4e1b-b628-f3dd05d533a0" LastKnownName="VehicleData" />
-            <description>Property VehicleData references type VehicleData.</description>
-            <relationshipOwnedElementsInternal>
-              <associationHasOwnedEnds>
-                <memberEnd Id="88f6e823-883d-4543-b505-fab2ff053354" name="VectoRunData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false" isNavigableOwned="false">
-                  <lowerValueInternal>
-                    <literalString Id="4d496ef1-dcdd-4855-a10a-ab6e1520e962" name="Lower" value="*">
-                      <elementDefinition Id="d8a9fded-c281-4da3-9a52-f0a5ccddbed5" />
-                    </literalString>
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString Id="7718e89e-002e-4d6a-aee2-0079d0873459" name="Upper" value="*">
-                      <elementDefinition Id="ece8e74c-77ca-4beb-b1b7-123de7fe305f" />
-                    </literalString>
-                  </upperValueInternal>
-                  <elementDefinition Id="33a880e3-bf50-4965-b6f5-1e5f139d4d1d" />
-                </memberEnd>
-              </associationHasOwnedEnds>
-              <associationHasOwnedEnds>
-                <memberEnd Id="079eb7f6-d0e9-4adb-b90e-5e55f77441cd" name="VehicleData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
-                  <lowerValueInternal>
-                    <literalString Id="830894de-646a-44d9-ac3e-7a33775021ad" name="Lower" value="1">
-                      <elementDefinition Id="f24c19b2-4888-4829-a497-93fb5824684e" />
-                    </literalString>
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString Id="c005f090-2962-400b-b320-c7996e4d07c8" name="Upper" value="1">
-                      <elementDefinition Id="3409d6f2-abf4-47d0-90c5-b5bcc08c2d95" />
-                    </literalString>
-                  </upperValueInternal>
-                  <elementDefinition Id="87bef004-200b-43c7-a5b4-255d582d4c6a" />
-                </memberEnd>
-              </associationHasOwnedEnds>
-            </relationshipOwnedElementsInternal>
-            <elementDefinition Id="2064d963-b60f-4a36-8e4f-c3e30b3238a8" />
-          </association>
-          <association Id="9f76f9fd-9510-485b-a0a9-e622ceafca6f" isDerived="false" sourceEndRoleName="VectoRunData" targetEndRoleName="GearboxData" isLeaf="false" isAbstract="false">
-            <classMoniker Id="e39a08de-34ee-434d-bf49-7cf05cc9800b" LastKnownName="GearboxData" />
-            <description>Property GearboxData references type GearboxData.</description>
-            <relationshipOwnedElementsInternal>
-              <associationHasOwnedEnds>
-                <memberEnd Id="4ed9451b-e5c0-40f5-9bf9-aa2f6a3e28b1" name="VectoRunData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false" isNavigableOwned="false">
-                  <lowerValueInternal>
-                    <literalString Id="71fb0837-20e7-462a-a506-d92ceb339e2e" name="Lower" value="*">
-                      <elementDefinition Id="6491c9e7-2241-4827-aa32-c2b135994eb0" />
-                    </literalString>
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString Id="69d3295f-1628-4c6e-8263-e304747b0981" name="Upper" value="*">
-                      <elementDefinition Id="306de421-b1c4-4fe9-b1d8-953c05b54472" />
-                    </literalString>
-                  </upperValueInternal>
-                  <elementDefinition Id="3c67f82f-2aef-4521-898d-30a97e5bdec4" />
-                </memberEnd>
-              </associationHasOwnedEnds>
-              <associationHasOwnedEnds>
-                <memberEnd Id="33b68579-2fbb-475b-a5cb-b183258447fd" name="GearboxData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
-                  <lowerValueInternal>
-                    <literalString Id="ef24dc23-8f48-480b-9219-a14e1ca7e4a5" name="Lower" value="1">
-                      <elementDefinition Id="99c4b399-8ae7-47af-8077-46bd395dab64" />
-                    </literalString>
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString Id="ea556351-9c88-44de-af32-7f488b530f6e" name="Upper" value="1">
-                      <elementDefinition Id="7e874768-45cd-4823-b5f8-b01644cbbe91" />
-                    </literalString>
-                  </upperValueInternal>
-                  <elementDefinition Id="5181d9ee-9625-4095-9c73-a55ad7113acf" />
-                </memberEnd>
-              </associationHasOwnedEnds>
-            </relationshipOwnedElementsInternal>
-            <elementDefinition Id="54937c6a-fd09-493f-a597-07c6cd6b4548" />
-          </association>
-          <association Id="54f75710-69f8-4559-963d-350932cf3a30" isDerived="false" sourceEndRoleName="VectoRunData" targetEndRoleName="Cycle" isLeaf="false" isAbstract="false">
-            <classMoniker Id="6ead1fd3-3513-47b2-af08-009172c53f5e" LastKnownName="DrivingCycleData" />
-            <description>Property Cycle references type DrivingCycleData.</description>
-            <relationshipOwnedElementsInternal>
-              <associationHasOwnedEnds>
-                <memberEnd Id="2bfade54-2ab1-4d7a-a389-9128a4e30b53" name="VectoRunData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false" isNavigableOwned="false">
-                  <lowerValueInternal>
-                    <literalString Id="fd3637b5-1349-4e86-b5de-d258fd2b1796" name="Lower" value="*">
-                      <elementDefinition Id="d4fe20ba-6fc4-48ba-9303-c8591bbcbd5c" />
-                    </literalString>
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString Id="17849b02-ae31-46c8-829b-3d5021da2f4b" name="Upper" value="*">
-                      <elementDefinition Id="42483743-8b5b-425d-b301-dcc005c8d0f6" />
-                    </literalString>
-                  </upperValueInternal>
-                  <elementDefinition Id="486ba54d-8996-4100-a62d-f8bb1a9c95d3" />
-                </memberEnd>
-              </associationHasOwnedEnds>
-              <associationHasOwnedEnds>
-                <memberEnd Id="f452fb32-2323-4fcc-a236-194baa617ff8" name="Cycle" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
-                  <lowerValueInternal>
-                    <literalString Id="0eee7d38-50fb-4c16-8da9-8a9d93c7d013" name="Lower" value="1">
-                      <elementDefinition Id="d9d47fbf-ac31-4390-8420-e5dd5b950c3e" />
-                    </literalString>
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString Id="9f3dc80a-b794-46e2-b462-311a4bfd02c4" name="Upper" value="1">
-                      <elementDefinition Id="3e54a097-abc7-4556-8d0b-6cb09940c4f0" />
-                    </literalString>
-                  </upperValueInternal>
-                  <elementDefinition Id="09faf534-6c2c-4768-bf11-ce6cb8dc57f9" />
-                </memberEnd>
-              </associationHasOwnedEnds>
-            </relationshipOwnedElementsInternal>
-            <elementDefinition Id="32e255d7-14bf-4530-80bc-b1cfbe3c35c8" />
-          </association>
-          <association Id="212f238e-d252-4502-89f9-2a720046c8ae" isDerived="false" sourceEndRoleName="VectoRunData" targetEndRoleName="DriverData" isLeaf="false" isAbstract="false">
-            <classMoniker Id="71d79f05-75c4-4e6d-afed-89ef1ad9e9df" LastKnownName="DriverData" />
-            <description>Property DriverData references type DriverData.</description>
-            <relationshipOwnedElementsInternal>
-              <associationHasOwnedEnds>
-                <memberEnd Id="555be582-5405-4e04-91b0-caafa8b545c5" name="VectoRunData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false" isNavigableOwned="false">
-                  <lowerValueInternal>
-                    <literalString Id="20f07b47-2bda-419c-b8f5-8f1054e8883d" name="Lower" value="*">
-                      <elementDefinition Id="78b09163-b40c-4593-8d04-bbb0178eef53" />
-                    </literalString>
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString Id="ae636c4e-5a67-447e-b692-a699f521ff89" name="Upper" value="*">
-                      <elementDefinition Id="30bdd4b9-80c7-478e-a0d1-78b1025d2460" />
-                    </literalString>
-                  </upperValueInternal>
-                  <elementDefinition Id="6b251265-4205-4dce-b7da-618c9f70e547" />
-                </memberEnd>
-              </associationHasOwnedEnds>
-              <associationHasOwnedEnds>
-                <memberEnd Id="9b32b13e-6d5e-46e4-9d41-083c814a5c10" name="DriverData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
-                  <lowerValueInternal>
-                    <literalString Id="39824b6a-9673-4a3d-b4dc-66e70bfb60c7" name="Lower" value="1">
-                      <elementDefinition Id="395c772e-38bf-404a-855f-6402267d9f37" />
-                    </literalString>
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString Id="9fc991ae-2d1d-4c12-a1f7-4ad3f8f0356b" name="Upper" value="1">
-                      <elementDefinition Id="4cdc8f7f-d32c-4b41-bb6a-841b2373e743" />
-                    </literalString>
-                  </upperValueInternal>
-                  <elementDefinition Id="390842b0-7bf2-4f8a-beab-3ab73080a144" />
-                </memberEnd>
-              </associationHasOwnedEnds>
-            </relationshipOwnedElementsInternal>
-            <elementDefinition Id="eea14270-73db-4f9b-8b80-ec72f74745b5" />
-          </association>
-          <association Id="66babcf4-0af4-4c62-a939-d9f66097abd8" isDerived="false" sourceEndRoleName="VectoRunData" targetEndRoleName="AuxiliaryData" isLeaf="false" isAbstract="false">
-            <classMoniker Id="b849feeb-48bf-4d4c-846b-837510854aab" LastKnownName="AuxiliaryData" />
-            <relationshipOwnedElementsInternal>
-              <associationHasOwnedEnds>
-                <memberEnd Id="11bffae4-efc4-4a0e-ac2c-e99912ff5ca0" name="VectoRunData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false" isNavigableOwned="false">
-                  <elementDefinition Id="0275de0d-b75f-4f52-b78b-3ed48b32c08b" />
-                </memberEnd>
-              </associationHasOwnedEnds>
-              <associationHasOwnedEnds>
-                <memberEnd Id="c4ca553e-3423-4447-80a5-4d6403aa42ad" name="AuxiliaryData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
-                  <elementDefinition Id="b6d6fb3c-604e-48c7-b44d-5c97ff340e41" />
-                </memberEnd>
-              </associationHasOwnedEnds>
-            </relationshipOwnedElementsInternal>
-            <elementDefinition Id="198ecbc3-a653-49b6-aebd-b1a77658b5cb" />
-          </association>
-        </targetEnds>
         <ownedAttributesInternal>
           <property Id="dc95816c-2ce0-496e-b3bc-74bebc31af40" name="VehicleData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
             <referencesInternal>
@@ -11920,6 +11754,24 @@
           </stereotypeInstance>
         </appliedStereotypesInternal>
         <elementDefinition Id="46973c13-d6ad-41e2-896e-0b14647bcd25" />
+        <targetEnds>
+          <association Id="d837d79c-19a9-4ed1-af8d-da9e0a54fe0b" isDerived="false" sourceEndRoleName="DrivingCycleData" targetEndRoleName="VectoRunData" isLeaf="false" isAbstract="false">
+            <classMoniker Id="3a375cac-c433-422a-9f21-f01e5dc0271d" LastKnownName="VectoRunData" />
+            <relationshipOwnedElementsInternal>
+              <associationHasOwnedEnds>
+                <memberEnd Id="5997a02f-e03c-44de-8bf0-1a33e1d38a0a" name="DrivingCycleData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false" isNavigableOwned="false">
+                  <elementDefinition Id="18fc0d6c-d768-4e8e-859e-ea89f4ea879e" />
+                </memberEnd>
+              </associationHasOwnedEnds>
+              <associationHasOwnedEnds>
+                <memberEnd Id="43129553-65a8-4543-8892-6a165bf51acf" name="VectoRunData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
+                  <elementDefinition Id="a6ccb293-1eb6-4c5a-b341-bdae135f432c" />
+                </memberEnd>
+              </associationHasOwnedEnds>
+            </relationshipOwnedElementsInternal>
+            <elementDefinition Id="354afeeb-693c-42b5-9974-456807fa039b" />
+          </association>
+        </targetEnds>
         <ownedAttributesInternal>
           <property Id="6937f978-1f0b-4dda-a933-462446015459" name="Entries" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
             <referencesInternal>
@@ -12540,6 +12392,24 @@
           </stereotypeInstance>
         </appliedStereotypesInternal>
         <elementDefinition Id="40d91768-4cfb-4b95-ade3-243ea20e028f" />
+        <targetEnds>
+          <association Id="9cab1077-1e5d-4343-b14a-e8c4fc4a4b30" isDerived="false" sourceEndRoleName="VehicleData" targetEndRoleName="VectoRunData" isLeaf="false" isAbstract="false">
+            <classMoniker Id="3a375cac-c433-422a-9f21-f01e5dc0271d" LastKnownName="VectoRunData" />
+            <relationshipOwnedElementsInternal>
+              <associationHasOwnedEnds>
+                <memberEnd Id="9b143195-0fb5-4454-9b73-27c758fb3394" name="VehicleData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false" isNavigableOwned="false">
+                  <elementDefinition Id="b6a4a194-d9c5-45ff-8ec1-039809a3af4d" />
+                </memberEnd>
+              </associationHasOwnedEnds>
+              <associationHasOwnedEnds>
+                <memberEnd Id="e4dd2920-5305-4694-9cf7-d20d69797496" name="VectoRunData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
+                  <elementDefinition Id="c4c54542-f835-40f8-a28f-96f6e95358cd" />
+                </memberEnd>
+              </associationHasOwnedEnds>
+            </relationshipOwnedElementsInternal>
+            <elementDefinition Id="7f1e0b04-958d-4b6d-96ad-87f6358554ec" />
+          </association>
+        </targetEnds>
         <ownedAttributesInternal>
           <property Id="65c78373-6f31-4c6e-bc70-892f107352ff" name="BasePath" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
             <referencesInternal>
@@ -14023,6 +13893,24 @@
           </stereotypeInstance>
         </appliedStereotypesInternal>
         <elementDefinition Id="8b5ae4e9-713d-4a09-9e2f-40ecdb827a34" />
+        <targetEnds>
+          <association Id="ce61f68f-6120-4203-83ee-577855c3e116" isDerived="false" sourceEndRoleName="GearboxData" targetEndRoleName="VectoRunData" isLeaf="false" isAbstract="false">
+            <classMoniker Id="3a375cac-c433-422a-9f21-f01e5dc0271d" LastKnownName="VectoRunData" />
+            <relationshipOwnedElementsInternal>
+              <associationHasOwnedEnds>
+                <memberEnd Id="2d941a9b-46b8-4676-a312-8427298e9114" name="GearboxData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false" isNavigableOwned="false">
+                  <elementDefinition Id="b1ef8d58-7082-4607-b54f-3bd41d36c243" />
+                </memberEnd>
+              </associationHasOwnedEnds>
+              <associationHasOwnedEnds>
+                <memberEnd Id="063c6f56-cf90-4a4b-b306-425762a690bd" name="VectoRunData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
+                  <elementDefinition Id="6518169e-f9ae-4d13-a3cc-35023bad8c2f" />
+                </memberEnd>
+              </associationHasOwnedEnds>
+            </relationshipOwnedElementsInternal>
+            <elementDefinition Id="4536e139-bf05-410c-9b04-5fcb5c42a141" />
+          </association>
+        </targetEnds>
         <ownedAttributesInternal>
           <property Id="8472175e-6055-4228-b339-8882aea9debb" name="ModelName" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
             <referencesInternal>
@@ -15118,6 +15006,24 @@
           </stereotypeInstance>
         </appliedStereotypesInternal>
         <elementDefinition Id="d269b480-bca9-4acd-9eda-fc737ea894a5" />
+        <targetEnds>
+          <association Id="b9d566f9-cdfb-4878-8048-312c5b832e59" isDerived="false" sourceEndRoleName="AuxiliaryData" targetEndRoleName="VectoRunData" isLeaf="false" isAbstract="false">
+            <classMoniker Id="3a375cac-c433-422a-9f21-f01e5dc0271d" LastKnownName="VectoRunData" />
+            <relationshipOwnedElementsInternal>
+              <associationHasOwnedEnds>
+                <memberEnd Id="ad29e1d8-9f30-43d9-adc8-7777bde66dcd" name="AuxiliaryData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false" isNavigableOwned="false">
+                  <elementDefinition Id="c7059322-9569-4aa8-9085-9e6c086d4d51" />
+                </memberEnd>
+              </associationHasOwnedEnds>
+              <associationHasOwnedEnds>
+                <memberEnd Id="21a997b2-0777-4be6-90ad-b6a6fd8d885b" name="VectoRunData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
+                  <elementDefinition Id="5e1baaee-9d13-4f04-b29c-60beb2b543b3" />
+                </memberEnd>
+              </associationHasOwnedEnds>
+            </relationshipOwnedElementsInternal>
+            <elementDefinition Id="ef3917ca-654b-46d7-9cbc-5a46b249a894" />
+          </association>
+        </targetEnds>
         <ownedAttributesInternal>
           <property Id="6e03be20-1f2e-41a1-98ee-fb334f30772e" name="EfficiencyToSupply" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
             <referencesInternal>
@@ -15571,6 +15477,24 @@
           </stereotypeInstance>
         </appliedStereotypesInternal>
         <elementDefinition Id="762dc6c3-0e90-457f-b14a-7dbda01548af" />
+        <targetEnds>
+          <association Id="f5e0457f-5d44-4708-90de-53bbcac4b3cf" isDerived="false" sourceEndRoleName="DriverData" targetEndRoleName="VectoRunData" isLeaf="false" isAbstract="false">
+            <classMoniker Id="3a375cac-c433-422a-9f21-f01e5dc0271d" LastKnownName="VectoRunData" />
+            <relationshipOwnedElementsInternal>
+              <associationHasOwnedEnds>
+                <memberEnd Id="dd5b283e-a86a-4c1c-8c1d-5223fa52f2c9" name="DriverData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false" isNavigableOwned="false">
+                  <elementDefinition Id="d8414e65-b7d9-4794-a647-003685910116" />
+                </memberEnd>
+              </associationHasOwnedEnds>
+              <associationHasOwnedEnds>
+                <memberEnd Id="a52e0f60-a62b-413f-ba2d-6763b937da11" name="VectoRunData" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
+                  <elementDefinition Id="dfe62726-00fe-4a8b-965b-5ef9d7c32bde" />
+                </memberEnd>
+              </associationHasOwnedEnds>
+            </relationshipOwnedElementsInternal>
+            <elementDefinition Id="d36381d1-6897-44df-9349-f92480ae180a" />
+          </association>
+        </targetEnds>
         <ownedOperationsInternal>
           <operation Id="63c21305-d20d-452f-bb67-db9793b695d3" name="DriverData" isLeaf="false" isStatic="false" isAbstract="false" concurrency="Sequential" isQuery="false">
             <referencesInternal>
diff --git a/VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram.layout b/VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram.layout
index e9808472051b22b45d3f111ec2e6811d95dc3b82..8bd3abc94a4a156ed3a210153ea9c4a880774ca0 100644
--- a/VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram.layout
+++ b/VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram.layout
@@ -2,11 +2,11 @@
 <logicalClassDesignerDiagram dslVersion="1.0.0.0" absoluteBounds="0, 0, 46.375, 33.875" name="FileInputAndPowertrainCreation">
   <logicalClassDesignerModelMoniker Id="10eefcfb-9021-4613-a5a9-1df862e14974" />
   <nestedChildShapes>
-    <classShape Id="32945b69-1b05-4a4c-932b-39d3f827126a" isExpanded="false" absoluteBounds="27.125, 17.625, 1.5, 0.50533563931783043" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
+    <classShape Id="32945b69-1b05-4a4c-932b-39d3f827126a" isExpanded="false" absoluteBounds="37.5, 15.75, 1.5, 0.50533563931783043" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
       <classMoniker Id="13edaa6b-621b-480b-9e76-d024550b0cde" LastKnownName="DeclarationData" />
       <nestedChildShapes>
-        <AttributeElementListCompartment Id="4dd0eaae-de65-45e8-b9d2-7b5283e5047d" absoluteBounds="27.14, 18.140335639317833, 1.4700000000000002, 3.5644530132412906" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
-        <OperationElementListCompartment Id="fc41c845-78a6-4d69-9dbd-3f7c49861118" absoluteBounds="27.14, 21.714788652559122, 1.4700000000000002, 0.84179684768120477" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <AttributeElementListCompartment Id="4dd0eaae-de65-45e8-b9d2-7b5283e5047d" absoluteBounds="37.515, 16.265335639317833, 1.4700000000000002, 3.5644530132412906" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <OperationElementListCompartment Id="fc41c845-78a6-4d69-9dbd-3f7c49861118" absoluteBounds="37.515, 19.839788652559122, 1.4700000000000002, 0.84179684768120477" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
     <classShape Id="92e22ee0-e709-439a-bb2a-d26a4c58d9c6" isExpanded="false" absoluteBounds="38.875, 0.5, 1.75, 0.50533563931783043" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
@@ -37,86 +37,86 @@
         <OperationElementListCompartment Id="0be1e8a2-3d83-4245-9307-3bda015f1760" absoluteBounds="38.89, 2.7891753265261645, 1.4700000000000002, 0.521484357615312" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </interfaceShape>
-    <classShape Id="e4e1e82e-f6b7-4354-a8bc-d0fed9f28b7a" isExpanded="false" absoluteBounds="39.875, 17.375, 1.5, 0.50533563931783043" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
+    <classShape Id="e4e1e82e-f6b7-4354-a8bc-d0fed9f28b7a" isExpanded="false" absoluteBounds="40.875, 16.125, 1.5, 0.50533563931783043" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
       <classMoniker Id="3a375cac-c433-422a-9f21-f01e5dc0271d" LastKnownName="VectoRunData" />
       <nestedChildShapes>
-        <AttributeElementListCompartment Id="87c6a151-9b9f-4230-a832-9614262180bd" absoluteBounds="39.89, 17.890335639317833, 1.4700000000000002, 1.8027343178788819" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
-        <OperationElementListCompartment Id="f0ae4aec-048f-4ce8-a266-201f8b9f2dd6" absoluteBounds="39.89, 19.703069957196711, 1.4700000000000002, 0.36132811258236552" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <AttributeElementListCompartment Id="87c6a151-9b9f-4230-a832-9614262180bd" absoluteBounds="40.89, 16.640335639317833, 1.4700000000000002, 1.8027343178788819" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <OperationElementListCompartment Id="f0ae4aec-048f-4ce8-a266-201f8b9f2dd6" absoluteBounds="40.89, 18.453069957196711, 1.4700000000000002, 0.36132811258236552" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <classShape Id="948a3143-fad9-4178-958f-7ec64b0a832d" isExpanded="false" absoluteBounds="40.75, 22, 1.5, 0.50533563931783043" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
+    <classShape Id="948a3143-fad9-4178-958f-7ec64b0a832d" absoluteBounds="42.75, 18.875, 1.5, 2.30892933468024" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
       <classMoniker Id="6ead1fd3-3513-47b2-af08-009172c53f5e" LastKnownName="DrivingCycleData" />
       <nestedChildShapes>
-        <AttributeElementListCompartment Id="ec73dcf0-33f1-4ff8-88ab-37eedefac4f6" absoluteBounds="40.765, 22.515335639317833, 1.4700000000000002, 0.52148435761531176" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
-        <OperationElementListCompartment Id="c8b0bb0c-aec4-4d58-a9ed-a9b0b327d7e0" absoluteBounds="40.765, 23.046819996933142, 1.4700000000000002, 1.1621093377470972" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <AttributeElementListCompartment Id="ec73dcf0-33f1-4ff8-88ab-37eedefac4f6" absoluteBounds="42.765, 19.390335639317833, 1.4700000000000002, 0.52148435761531176" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <OperationElementListCompartment Id="c8b0bb0c-aec4-4d58-a9ed-a9b0b327d7e0" absoluteBounds="42.765, 19.921819996933142, 1.4700000000000002, 1.1621093377470972" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(41.0625 : 17.8803356393178); (41.0625 : 22)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" sourceMultiplicity="*" targetMultiplicity="1">
-      <associationMoniker Id="54f75710-69f8-4559-963d-350932cf3a30" />
+    <associationConnector edgePoints="[(43.5 : 18.875); (43.5 : 16.2988746147442); (42.375 : 16.2988746147442)]" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110" sourceMultiplicity="1" targetMultiplicity="1">
+      <associationMoniker Id="d837d79c-19a9-4ed1-af8d-da9e0a54fe0b" />
       <relativeChildShapes />
       <nodes>
-        <classShapeMoniker Id="e4e1e82e-f6b7-4354-a8bc-d0fed9f28b7a" />
         <classShapeMoniker Id="948a3143-fad9-4178-958f-7ec64b0a832d" />
+        <classShapeMoniker Id="e4e1e82e-f6b7-4354-a8bc-d0fed9f28b7a" />
       </nodes>
     </associationConnector>
-    <classShape Id="dbb1eefe-d69e-445f-b438-c43e2d93dcd6" isExpanded="false" absoluteBounds="37.375, 22.625, 1.5, 0.50533563931783043" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
+    <classShape Id="dbb1eefe-d69e-445f-b438-c43e2d93dcd6" absoluteBounds="40.875, 18.875, 1.5, 4.8714292552073815" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
       <classMoniker Id="3a121d7b-4cfc-4e1b-b628-f3dd05d533a0" LastKnownName="VehicleData" />
       <nestedChildShapes>
-        <AttributeElementListCompartment Id="d677b1b7-94a6-4a54-bc2d-1be5e5289046" absoluteBounds="37.39, 23.140335639317833, 1.4700000000000002, 3.4042967682083445" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
-        <OperationElementListCompartment Id="62411cbb-7148-466a-8210-9693700cbaac" absoluteBounds="37.39, 26.554632407526174, 1.4700000000000002, 0.84179684768120433" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <AttributeElementListCompartment Id="d677b1b7-94a6-4a54-bc2d-1be5e5289046" absoluteBounds="40.89, 19.390335639317833, 1.4700000000000002, 3.4042967682083445" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <OperationElementListCompartment Id="62411cbb-7148-466a-8210-9693700cbaac" absoluteBounds="40.89, 22.804632407526174, 1.4700000000000002, 0.84179684768120433" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(40.471680859375 : 17.8803356393178); (40.471680859375 : 22.8953018265661); (38.875 : 22.8953018265661)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" sourceMultiplicity="*" targetMultiplicity="1">
-      <associationMoniker Id="b6aac638-0738-48de-96d2-dffb9428059e" />
+    <associationConnector edgePoints="[(41.625 : 18.875); (41.625 : 16.6303356393178)]" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110" sourceMultiplicity="1" targetMultiplicity="1">
+      <associationMoniker Id="9cab1077-1e5d-4343-b14a-e8c4fc4a4b30" />
       <relativeChildShapes />
       <nodes>
-        <classShapeMoniker Id="e4e1e82e-f6b7-4354-a8bc-d0fed9f28b7a" />
         <classShapeMoniker Id="dbb1eefe-d69e-445f-b438-c43e2d93dcd6" />
+        <classShapeMoniker Id="e4e1e82e-f6b7-4354-a8bc-d0fed9f28b7a" />
       </nodes>
     </associationConnector>
-    <classShape Id="ac398059-e319-4af4-a4fe-6b77f1d8b9e2" isExpanded="false" absoluteBounds="34, 21.625, 1.5, 0.50533563931783043" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
+    <classShape Id="ac398059-e319-4af4-a4fe-6b77f1d8b9e2" absoluteBounds="37.125, 18.875, 1.5, 3.7503355399767564" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
       <classMoniker Id="e39a08de-34ee-434d-bf49-7cf05cc9800b" LastKnownName="GearboxData" />
       <nestedChildShapes>
-        <AttributeElementListCompartment Id="7c897b8a-b254-4fa1-838b-aed0ad08c793" absoluteBounds="34.015, 22.140335639317833, 1.4700000000000002, 2.4433592980106669" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
-        <OperationElementListCompartment Id="fc8d1b55-e45d-4df1-958d-368354551023" absoluteBounds="34.015, 24.593694937328497, 1.4700000000000002, 0.68164060264825821" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <AttributeElementListCompartment Id="7c897b8a-b254-4fa1-838b-aed0ad08c793" absoluteBounds="37.14, 19.390335639317833, 1.4700000000000002, 2.4433592980106669" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <OperationElementListCompartment Id="fc8d1b55-e45d-4df1-958d-368354551023" absoluteBounds="37.14, 21.843694937328497, 1.4700000000000002, 0.68164060264825821" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(40.19335671875 : 17.8803356393178); (40.19335671875 : 21.78125); (35.5 : 21.78125)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" sourceMultiplicity="*" targetMultiplicity="1">
-      <associationMoniker Id="9f76f9fd-9510-485b-a0a9-e622ceafca6f" />
+    <associationConnector edgePoints="[(37.28125 : 18.875); (37.28125 : 16.4740856393178); (39.6979166666667 : 16.4740856393178 : JumpStart); (39.8645833333333 : 16.4740856393178 : JumpEnd); (40.875 : 16.4740856393178)]" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110" sourceMultiplicity="1" targetMultiplicity="1">
+      <associationMoniker Id="ce61f68f-6120-4203-83ee-577855c3e116" />
       <relativeChildShapes />
       <nodes>
-        <classShapeMoniker Id="e4e1e82e-f6b7-4354-a8bc-d0fed9f28b7a" />
         <classShapeMoniker Id="ac398059-e319-4af4-a4fe-6b77f1d8b9e2" />
+        <classShapeMoniker Id="e4e1e82e-f6b7-4354-a8bc-d0fed9f28b7a" />
       </nodes>
     </associationConnector>
-    <classShape Id="6c767247-2d0c-4474-b753-fac3cf70fde8" isExpanded="false" absoluteBounds="34.75, 16.5, 1.5, 0.50533563931783043" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
+    <classShape Id="6c767247-2d0c-4474-b753-fac3cf70fde8" absoluteBounds="39, 18.875, 1.5, 1.9886168446143486" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
       <classMoniker Id="b849feeb-48bf-4d4c-846b-837510854aab" LastKnownName="AuxiliaryData" />
       <nestedChildShapes>
-        <AttributeElementListCompartment Id="326139dd-2c44-4695-a4c3-6f63e289959b" absoluteBounds="34.765, 17.015335639317833, 1.4700000000000002, 0.68164060264825832" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
-        <OperationElementListCompartment Id="1b8b7f30-4b0d-44e8-bd87-a82ed58d3076" absoluteBounds="34.765, 17.706976241966089, 1.4700000000000002, 0.68164060264825821" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <AttributeElementListCompartment Id="326139dd-2c44-4695-a4c3-6f63e289959b" absoluteBounds="39.015, 19.390335639317833, 1.4700000000000002, 0.68164060264825832" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <OperationElementListCompartment Id="1b8b7f30-4b0d-44e8-bd87-a82ed58d3076" absoluteBounds="39.015, 20.081976241966089, 1.4700000000000002, 0.68164060264825821" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(39.875 : 17.6276678196589); (35.5 : 17.6276678196589); (35.5 : 17.0053356393178)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" sourceMultiplicity="1" targetMultiplicity="1">
-      <associationMoniker Id="66babcf4-0af4-4c62-a939-d9f66097abd8" />
+    <associationConnector edgePoints="[(39.78125 : 18.875); (39.78125 : 16.2682903196589); (40.875 : 16.2682903196589)]" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110" sourceMultiplicity="1" targetMultiplicity="1">
+      <associationMoniker Id="b9d566f9-cdfb-4878-8048-312c5b832e59" />
       <relativeChildShapes />
       <nodes>
-        <classShapeMoniker Id="e4e1e82e-f6b7-4354-a8bc-d0fed9f28b7a" />
         <classShapeMoniker Id="6c767247-2d0c-4474-b753-fac3cf70fde8" />
+        <classShapeMoniker Id="e4e1e82e-f6b7-4354-a8bc-d0fed9f28b7a" />
       </nodes>
     </associationConnector>
-    <classShape Id="f43db161-821b-4e1c-970b-f5da4c717597" isExpanded="false" absoluteBounds="44.625, 18.875, 1.5, 0.50533563931783043" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
+    <classShape Id="f43db161-821b-4e1c-970b-f5da4c717597" absoluteBounds="44.625, 18.875, 1.5, 1.1878356194496185" hideQualifiedName="true" increaseHeight="0.18800345897674561" customColor="181, 193, 223">
       <classMoniker Id="71d79f05-75c4-4e6d-afed-89ef1ad9e9df" LastKnownName="DriverData" />
       <nestedChildShapes>
         <AttributeElementListCompartment Id="a77aee70-7496-47e6-aadd-b343c77a9f51" absoluteBounds="44.64, 19.390335639317833, 1.4700000000000002, 0.2011718675494194" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
         <OperationElementListCompartment Id="0d07dcc3-d3fd-4efc-a1f9-163083a623fa" absoluteBounds="44.64, 19.60150750686725, 1.4700000000000002, 0.36132811258236563" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(41.375 : 17.6036333017937); (45.375 : 17.6036333017937); (45.375 : 18.875)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" sourceMultiplicity="*" targetMultiplicity="1">
-      <associationMoniker Id="212f238e-d252-4502-89f9-2a720046c8ae" />
+    <associationConnector edgePoints="[(45.375 : 18.875); (45.375 : 16.495857627031); (43.5833333333333 : 16.495857627031 : JumpStart); (43.4166666666667 : 16.495857627031 : JumpEnd); (42.375 : 16.495857627031)]" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110" sourceMultiplicity="1" targetMultiplicity="1">
+      <associationMoniker Id="f5e0457f-5d44-4708-90de-53bbcac4b3cf" />
       <relativeChildShapes />
       <nodes>
-        <classShapeMoniker Id="e4e1e82e-f6b7-4354-a8bc-d0fed9f28b7a" />
         <classShapeMoniker Id="f43db161-821b-4e1c-970b-f5da4c717597" />
+        <classShapeMoniker Id="e4e1e82e-f6b7-4354-a8bc-d0fed9f28b7a" />
       </nodes>
     </associationConnector>
     <packageShape Id="dd60f6a8-1d21-45ed-b3b2-74c2cfa0f2d7" absoluteBounds="0.5, 0.5, 28.125, 13.5" customColor="255, 249, 230" hideQualifiedName="false">
@@ -311,7 +311,7 @@
         </interfaceShape>
       </nestedChildShapes>
     </packageShape>
-    <associationConnector edgePoints="[(40.625 : 1.48017098944411); (41 : 1.48017098944411); (41 : 4.5); (31.625 : 4.5); (31.625 : 4.875)]" fixedFrom="Caller" fixedTo="NotFixed" customColor="113, 111, 110" sourceMultiplicity="*" targetMultiplicity="1">
+    <associationConnector edgePoints="[(40.625 : 1.48017098944411); (41 : 1.48017098944411); (41 : 4.5); (31.625 : 4.5); (31.625 : 4.875)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" sourceMultiplicity="*" targetMultiplicity="1">
       <associationMoniker Id="cc3d028d-cecf-4d74-a0ee-ccab4b1e31b1" />
       <relativeChildShapes />
       <nodes>
@@ -343,7 +343,7 @@
         <classShapeMoniker Id="0530f690-3df6-43ec-9071-0eb4fc74b5dc" />
       </nodes>
     </generalizationConnector>
-    <associationConnector edgePoints="[(33.96875 : 13.6292418247461); (33.96875 : 17.8790017294884); (28.625 : 17.8790017294884)]" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110" sourceMultiplicity="1" targetMultiplicity="1">
+    <associationConnector edgePoints="[(35.125 : 13.6292418247461); (35.125 : 16.0026678196589); (37.5 : 16.0026678196589)]" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110" sourceMultiplicity="1" targetMultiplicity="1">
       <associationMoniker Id="ce9c296a-71a9-47a3-8b69-8975936a080f" />
       <relativeChildShapes />
       <nodes>
diff --git a/VectoCoreArchitecture/ModelDefinition/Package2_1315.uml b/VectoCoreArchitecture/ModelDefinition/Package2_1315.uml
index 39c604d269d562e4a95006a94fd452d765310bd5..f19b4ff0a7f7f4df29e95f9fe1f117f4db64808c 100644
--- a/VectoCoreArchitecture/ModelDefinition/Package2_1315.uml
+++ b/VectoCoreArchitecture/ModelDefinition/Package2_1315.uml
@@ -324,6 +324,45 @@
               </associationHasOwnedEnds>
             </relationshipOwnedElementsInternal>
           </association>
+          <association
+            Id="ef3917ca-654b-46d7-9cbc-5a46b249a894"
+            isDerived="false"
+            sourceEndRoleName="AuxiliaryData"
+            targetEndRoleName="VectoRunData"
+            isLeaf="false"
+            isAbstract="false">
+            <classMoniker
+              Id="fcad8ea5-8fd5-485d-81e2-eff3f6888981"
+              LastKnownName="VectoRunData"
+              LastKnownLocation="Package4_1315.uml" />
+            <relationshipOwnedElementsInternal>
+              <associationHasOwnedEnds>
+                <memberEnd
+                  Id="c7059322-9569-4aa8-9085-9e6c086d4d51"
+                  name="AuxiliaryData"
+                  isLeaf="false"
+                  isStatic="false"
+                  isReadOnly="false"
+                  isDerived="false"
+                  isDerivedUnion="false"
+                  aggregation="None"
+                  isComposite="false"
+                  isNavigableOwned="false" />
+              </associationHasOwnedEnds>
+              <associationHasOwnedEnds>
+                <memberEnd
+                  Id="5e1baaee-9d13-4f04-b29c-60beb2b543b3"
+                  name="VectoRunData"
+                  isLeaf="false"
+                  isStatic="false"
+                  isReadOnly="false"
+                  isDerived="false"
+                  isDerivedUnion="false"
+                  aggregation="None"
+                  isComposite="false" />
+              </associationHasOwnedEnds>
+            </relationshipOwnedElementsInternal>
+          </association>
         </targetEnds>
         <ownedAttributesInternal>
           <property
diff --git a/VectoCoreArchitecture/ModelDefinition/Package3_1315.uml b/VectoCoreArchitecture/ModelDefinition/Package3_1315.uml
index 43030342eda25d70199aad6a117a43331d64bf27..2fa04cf4a70110d53b7be882181f456b18b9dd18 100644
--- a/VectoCoreArchitecture/ModelDefinition/Package3_1315.uml
+++ b/VectoCoreArchitecture/ModelDefinition/Package3_1315.uml
@@ -335,6 +335,45 @@
               </associationHasOwnedEnds>
             </relationshipOwnedElementsInternal>
           </association>
+          <association
+            Id="354afeeb-693c-42b5-9974-456807fa039b"
+            isDerived="false"
+            sourceEndRoleName="DrivingCycleData"
+            targetEndRoleName="VectoRunData"
+            isLeaf="false"
+            isAbstract="false">
+            <classMoniker
+              Id="fcad8ea5-8fd5-485d-81e2-eff3f6888981"
+              LastKnownName="VectoRunData"
+              LastKnownLocation="Package4_1315.uml" />
+            <relationshipOwnedElementsInternal>
+              <associationHasOwnedEnds>
+                <memberEnd
+                  Id="18fc0d6c-d768-4e8e-859e-ea89f4ea879e"
+                  name="DrivingCycleData"
+                  isLeaf="false"
+                  isStatic="false"
+                  isReadOnly="false"
+                  isDerived="false"
+                  isDerivedUnion="false"
+                  aggregation="None"
+                  isComposite="false"
+                  isNavigableOwned="false" />
+              </associationHasOwnedEnds>
+              <associationHasOwnedEnds>
+                <memberEnd
+                  Id="a6ccb293-1eb6-4c5a-b341-bdae135f432c"
+                  name="VectoRunData"
+                  isLeaf="false"
+                  isStatic="false"
+                  isReadOnly="false"
+                  isDerived="false"
+                  isDerivedUnion="false"
+                  aggregation="None"
+                  isComposite="false" />
+              </associationHasOwnedEnds>
+            </relationshipOwnedElementsInternal>
+          </association>
         </targetEnds>
         <ownedAttributesInternal>
           <property
@@ -2426,6 +2465,45 @@
               </associationHasOwnedEnds>
             </relationshipOwnedElementsInternal>
           </association>
+          <association
+            Id="7f1e0b04-958d-4b6d-96ad-87f6358554ec"
+            isDerived="false"
+            sourceEndRoleName="VehicleData"
+            targetEndRoleName="VectoRunData"
+            isLeaf="false"
+            isAbstract="false">
+            <classMoniker
+              Id="fcad8ea5-8fd5-485d-81e2-eff3f6888981"
+              LastKnownName="VectoRunData"
+              LastKnownLocation="Package4_1315.uml" />
+            <relationshipOwnedElementsInternal>
+              <associationHasOwnedEnds>
+                <memberEnd
+                  Id="b6a4a194-d9c5-45ff-8ec1-039809a3af4d"
+                  name="VehicleData"
+                  isLeaf="false"
+                  isStatic="false"
+                  isReadOnly="false"
+                  isDerived="false"
+                  isDerivedUnion="false"
+                  aggregation="None"
+                  isComposite="false"
+                  isNavigableOwned="false" />
+              </associationHasOwnedEnds>
+              <associationHasOwnedEnds>
+                <memberEnd
+                  Id="c4c54542-f835-40f8-a28f-96f6e95358cd"
+                  name="VectoRunData"
+                  isLeaf="false"
+                  isStatic="false"
+                  isReadOnly="false"
+                  isDerived="false"
+                  isDerivedUnion="false"
+                  aggregation="None"
+                  isComposite="false" />
+              </associationHasOwnedEnds>
+            </relationshipOwnedElementsInternal>
+          </association>
         </targetEnds>
         <ownedAttributesInternal>
           <property
@@ -4970,6 +5048,45 @@
               </associationHasOwnedEnds>
             </relationshipOwnedElementsInternal>
           </association>
+          <association
+            Id="4536e139-bf05-410c-9b04-5fcb5c42a141"
+            isDerived="false"
+            sourceEndRoleName="GearboxData"
+            targetEndRoleName="VectoRunData"
+            isLeaf="false"
+            isAbstract="false">
+            <classMoniker
+              Id="fcad8ea5-8fd5-485d-81e2-eff3f6888981"
+              LastKnownName="VectoRunData"
+              LastKnownLocation="Package4_1315.uml" />
+            <relationshipOwnedElementsInternal>
+              <associationHasOwnedEnds>
+                <memberEnd
+                  Id="b1ef8d58-7082-4607-b54f-3bd41d36c243"
+                  name="GearboxData"
+                  isLeaf="false"
+                  isStatic="false"
+                  isReadOnly="false"
+                  isDerived="false"
+                  isDerivedUnion="false"
+                  aggregation="None"
+                  isComposite="false"
+                  isNavigableOwned="false" />
+              </associationHasOwnedEnds>
+              <associationHasOwnedEnds>
+                <memberEnd
+                  Id="6518169e-f9ae-4d13-a3cc-35023bad8c2f"
+                  name="VectoRunData"
+                  isLeaf="false"
+                  isStatic="false"
+                  isReadOnly="false"
+                  isDerived="false"
+                  isDerivedUnion="false"
+                  aggregation="None"
+                  isComposite="false" />
+              </associationHasOwnedEnds>
+            </relationshipOwnedElementsInternal>
+          </association>
         </targetEnds>
         <ownedAttributesInternal>
           <property
@@ -6382,6 +6499,47 @@
             </propertyInstances>
           </stereotypeInstance>
         </appliedStereotypesInternal>
+        <targetEnds>
+          <association
+            Id="d36381d1-6897-44df-9349-f92480ae180a"
+            isDerived="false"
+            sourceEndRoleName="DriverData"
+            targetEndRoleName="VectoRunData"
+            isLeaf="false"
+            isAbstract="false">
+            <classMoniker
+              Id="fcad8ea5-8fd5-485d-81e2-eff3f6888981"
+              LastKnownName="VectoRunData"
+              LastKnownLocation="Package4_1315.uml" />
+            <relationshipOwnedElementsInternal>
+              <associationHasOwnedEnds>
+                <memberEnd
+                  Id="d8414e65-b7d9-4794-a647-003685910116"
+                  name="DriverData"
+                  isLeaf="false"
+                  isStatic="false"
+                  isReadOnly="false"
+                  isDerived="false"
+                  isDerivedUnion="false"
+                  aggregation="None"
+                  isComposite="false"
+                  isNavigableOwned="false" />
+              </associationHasOwnedEnds>
+              <associationHasOwnedEnds>
+                <memberEnd
+                  Id="dfe62726-00fe-4a8b-965b-5ef9d7c32bde"
+                  name="VectoRunData"
+                  isLeaf="false"
+                  isStatic="false"
+                  isReadOnly="false"
+                  isDerived="false"
+                  isDerivedUnion="false"
+                  aggregation="None"
+                  isComposite="false" />
+              </associationHasOwnedEnds>
+            </relationshipOwnedElementsInternal>
+          </association>
+        </targetEnds>
         <ownedOperationsInternal>
           <operation
             Id="a84274e8-e664-4cba-8a34-98f6cacdb299"
diff --git a/VectoCoreArchitecture/ModelDefinition/Package4_1315.uml b/VectoCoreArchitecture/ModelDefinition/Package4_1315.uml
index 02d18f43a77f26874281eab738856dee74ed3af7..8b9c19501e8b3b27dc011ac436b822e87b50249c 100644
--- a/VectoCoreArchitecture/ModelDefinition/Package4_1315.uml
+++ b/VectoCoreArchitecture/ModelDefinition/Package4_1315.uml
@@ -2113,72 +2113,6 @@
           </generalization>
         </generalsInternal>
         <targetEnds>
-          <association
-            Id="2064d963-b60f-4a36-8e4f-c3e30b3238a8"
-            isDerived="false"
-            sourceEndRoleName="VectoRunData"
-            targetEndRoleName="VehicleData"
-            isLeaf="false"
-            isAbstract="false">
-            <classMoniker
-              Id="40d91768-4cfb-4b95-ade3-243ea20e028f"
-              LastKnownName="VehicleData"
-              LastKnownLocation="Package3_1315.uml" />
-            <description>Property VehicleData references type VehicleData.</description>
-            <relationshipOwnedElementsInternal>
-              <associationHasOwnedEnds>
-                <memberEnd
-                  Id="33a880e3-bf50-4965-b6f5-1e5f139d4d1d"
-                  name="VectoRunData"
-                  isLeaf="false"
-                  isStatic="false"
-                  isReadOnly="false"
-                  isDerived="false"
-                  isDerivedUnion="false"
-                  aggregation="None"
-                  isComposite="false"
-                  isNavigableOwned="false">
-                  <lowerValueInternal>
-                    <literalString
-                      Id="d8a9fded-c281-4da3-9a52-f0a5ccddbed5"
-                      name="Lower"
-                      value="*" />
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString
-                      Id="ece8e74c-77ca-4beb-b1b7-123de7fe305f"
-                      name="Upper"
-                      value="*" />
-                  </upperValueInternal>
-                </memberEnd>
-              </associationHasOwnedEnds>
-              <associationHasOwnedEnds>
-                <memberEnd
-                  Id="87bef004-200b-43c7-a5b4-255d582d4c6a"
-                  name="VehicleData"
-                  isLeaf="false"
-                  isStatic="false"
-                  isReadOnly="false"
-                  isDerived="false"
-                  isDerivedUnion="false"
-                  aggregation="None"
-                  isComposite="false">
-                  <lowerValueInternal>
-                    <literalString
-                      Id="f24c19b2-4888-4829-a497-93fb5824684e"
-                      name="Lower"
-                      value="1" />
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString
-                      Id="3409d6f2-abf4-47d0-90c5-b5bcc08c2d95"
-                      name="Upper"
-                      value="1" />
-                  </upperValueInternal>
-                </memberEnd>
-              </associationHasOwnedEnds>
-            </relationshipOwnedElementsInternal>
-          </association>
           <association
             Id="f87abb1c-6acb-40b7-b801-7723dcf0ba5c"
             isDerived="false"
@@ -2245,138 +2179,6 @@
               </associationHasOwnedEnds>
             </relationshipOwnedElementsInternal>
           </association>
-          <association
-            Id="54937c6a-fd09-493f-a597-07c6cd6b4548"
-            isDerived="false"
-            sourceEndRoleName="VectoRunData"
-            targetEndRoleName="GearboxData"
-            isLeaf="false"
-            isAbstract="false">
-            <classMoniker
-              Id="8b5ae4e9-713d-4a09-9e2f-40ecdb827a34"
-              LastKnownName="GearboxData"
-              LastKnownLocation="Package3_1315.uml" />
-            <description>Property GearboxData references type GearboxData.</description>
-            <relationshipOwnedElementsInternal>
-              <associationHasOwnedEnds>
-                <memberEnd
-                  Id="3c67f82f-2aef-4521-898d-30a97e5bdec4"
-                  name="VectoRunData"
-                  isLeaf="false"
-                  isStatic="false"
-                  isReadOnly="false"
-                  isDerived="false"
-                  isDerivedUnion="false"
-                  aggregation="None"
-                  isComposite="false"
-                  isNavigableOwned="false">
-                  <lowerValueInternal>
-                    <literalString
-                      Id="6491c9e7-2241-4827-aa32-c2b135994eb0"
-                      name="Lower"
-                      value="*" />
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString
-                      Id="306de421-b1c4-4fe9-b1d8-953c05b54472"
-                      name="Upper"
-                      value="*" />
-                  </upperValueInternal>
-                </memberEnd>
-              </associationHasOwnedEnds>
-              <associationHasOwnedEnds>
-                <memberEnd
-                  Id="5181d9ee-9625-4095-9c73-a55ad7113acf"
-                  name="GearboxData"
-                  isLeaf="false"
-                  isStatic="false"
-                  isReadOnly="false"
-                  isDerived="false"
-                  isDerivedUnion="false"
-                  aggregation="None"
-                  isComposite="false">
-                  <lowerValueInternal>
-                    <literalString
-                      Id="99c4b399-8ae7-47af-8077-46bd395dab64"
-                      name="Lower"
-                      value="1" />
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString
-                      Id="7e874768-45cd-4823-b5f8-b01644cbbe91"
-                      name="Upper"
-                      value="1" />
-                  </upperValueInternal>
-                </memberEnd>
-              </associationHasOwnedEnds>
-            </relationshipOwnedElementsInternal>
-          </association>
-          <association
-            Id="32e255d7-14bf-4530-80bc-b1cfbe3c35c8"
-            isDerived="false"
-            sourceEndRoleName="VectoRunData"
-            targetEndRoleName="Cycle"
-            isLeaf="false"
-            isAbstract="false">
-            <classMoniker
-              Id="46973c13-d6ad-41e2-896e-0b14647bcd25"
-              LastKnownName="DrivingCycleData"
-              LastKnownLocation="Package3_1315.uml" />
-            <description>Property Cycle references type DrivingCycleData.</description>
-            <relationshipOwnedElementsInternal>
-              <associationHasOwnedEnds>
-                <memberEnd
-                  Id="486ba54d-8996-4100-a62d-f8bb1a9c95d3"
-                  name="VectoRunData"
-                  isLeaf="false"
-                  isStatic="false"
-                  isReadOnly="false"
-                  isDerived="false"
-                  isDerivedUnion="false"
-                  aggregation="None"
-                  isComposite="false"
-                  isNavigableOwned="false">
-                  <lowerValueInternal>
-                    <literalString
-                      Id="d4fe20ba-6fc4-48ba-9303-c8591bbcbd5c"
-                      name="Lower"
-                      value="*" />
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString
-                      Id="42483743-8b5b-425d-b301-dcc005c8d0f6"
-                      name="Upper"
-                      value="*" />
-                  </upperValueInternal>
-                </memberEnd>
-              </associationHasOwnedEnds>
-              <associationHasOwnedEnds>
-                <memberEnd
-                  Id="09faf534-6c2c-4768-bf11-ce6cb8dc57f9"
-                  name="Cycle"
-                  isLeaf="false"
-                  isStatic="false"
-                  isReadOnly="false"
-                  isDerived="false"
-                  isDerivedUnion="false"
-                  aggregation="None"
-                  isComposite="false">
-                  <lowerValueInternal>
-                    <literalString
-                      Id="d9d47fbf-ac31-4390-8420-e5dd5b950c3e"
-                      name="Lower"
-                      value="1" />
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString
-                      Id="3e54a097-abc7-4556-8d0b-6cb09940c4f0"
-                      name="Upper"
-                      value="1" />
-                  </upperValueInternal>
-                </memberEnd>
-              </associationHasOwnedEnds>
-            </relationshipOwnedElementsInternal>
-          </association>
           <association
             Id="b0a926de-0ec1-42a6-997e-e088ac447e4c"
             isDerived="false"
@@ -2443,111 +2245,6 @@
               </associationHasOwnedEnds>
             </relationshipOwnedElementsInternal>
           </association>
-          <association
-            Id="eea14270-73db-4f9b-8b80-ec72f74745b5"
-            isDerived="false"
-            sourceEndRoleName="VectoRunData"
-            targetEndRoleName="DriverData"
-            isLeaf="false"
-            isAbstract="false">
-            <classMoniker
-              Id="762dc6c3-0e90-457f-b14a-7dbda01548af"
-              LastKnownName="DriverData"
-              LastKnownLocation="Package3_1315.uml" />
-            <description>Property DriverData references type DriverData.</description>
-            <relationshipOwnedElementsInternal>
-              <associationHasOwnedEnds>
-                <memberEnd
-                  Id="6b251265-4205-4dce-b7da-618c9f70e547"
-                  name="VectoRunData"
-                  isLeaf="false"
-                  isStatic="false"
-                  isReadOnly="false"
-                  isDerived="false"
-                  isDerivedUnion="false"
-                  aggregation="None"
-                  isComposite="false"
-                  isNavigableOwned="false">
-                  <lowerValueInternal>
-                    <literalString
-                      Id="78b09163-b40c-4593-8d04-bbb0178eef53"
-                      name="Lower"
-                      value="*" />
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString
-                      Id="30bdd4b9-80c7-478e-a0d1-78b1025d2460"
-                      name="Upper"
-                      value="*" />
-                  </upperValueInternal>
-                </memberEnd>
-              </associationHasOwnedEnds>
-              <associationHasOwnedEnds>
-                <memberEnd
-                  Id="390842b0-7bf2-4f8a-beab-3ab73080a144"
-                  name="DriverData"
-                  isLeaf="false"
-                  isStatic="false"
-                  isReadOnly="false"
-                  isDerived="false"
-                  isDerivedUnion="false"
-                  aggregation="None"
-                  isComposite="false">
-                  <lowerValueInternal>
-                    <literalString
-                      Id="395c772e-38bf-404a-855f-6402267d9f37"
-                      name="Lower"
-                      value="1" />
-                  </lowerValueInternal>
-                  <upperValueInternal>
-                    <literalString
-                      Id="4cdc8f7f-d32c-4b41-bb6a-841b2373e743"
-                      name="Upper"
-                      value="1" />
-                  </upperValueInternal>
-                </memberEnd>
-              </associationHasOwnedEnds>
-            </relationshipOwnedElementsInternal>
-          </association>
-          <association
-            Id="198ecbc3-a653-49b6-aebd-b1a77658b5cb"
-            isDerived="false"
-            sourceEndRoleName="VectoRunData"
-            targetEndRoleName="AuxiliaryData"
-            isLeaf="false"
-            isAbstract="false">
-            <classMoniker
-              Id="d269b480-bca9-4acd-9eda-fc737ea894a5"
-              LastKnownName="AuxiliaryData"
-              LastKnownLocation="Package2_1315.uml" />
-            <relationshipOwnedElementsInternal>
-              <associationHasOwnedEnds>
-                <memberEnd
-                  Id="0275de0d-b75f-4f52-b78b-3ed48b32c08b"
-                  name="VectoRunData"
-                  isLeaf="false"
-                  isStatic="false"
-                  isReadOnly="false"
-                  isDerived="false"
-                  isDerivedUnion="false"
-                  aggregation="None"
-                  isComposite="false"
-                  isNavigableOwned="false" />
-              </associationHasOwnedEnds>
-              <associationHasOwnedEnds>
-                <memberEnd
-                  Id="b6d6fb3c-604e-48c7-b44d-5c97ff340e41"
-                  name="AuxiliaryData"
-                  isLeaf="false"
-                  isStatic="false"
-                  isReadOnly="false"
-                  isDerived="false"
-                  isDerivedUnion="false"
-                  aggregation="None"
-                  isComposite="false" />
-              </associationHasOwnedEnds>
-            </relationshipOwnedElementsInternal>
-          </association>
         </targetEnds>
         <ownedAttributesInternal>
           <property
diff --git a/VectoCoreArchitecture/ModelDefinition/Package_1320.uml b/VectoCoreArchitecture/ModelDefinition/Package_1320.uml
index f0dc1b1d985c3b8d6d74c01750e30cef75b7ba7a..72026482655ed80ed2dbe14a53b2008e41246308 100644
--- a/VectoCoreArchitecture/ModelDefinition/Package_1320.uml
+++ b/VectoCoreArchitecture/ModelDefinition/Package_1320.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<package xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" xmlns:dm1="http://schemas.microsoft.com/dsltools/Kernel" xmlns:dm2="http://schemas.microsoft.com/dsltools/Component" xmlns:dm3="http://schemas.microsoft.com/dsltools/UseCase" xmlns:dm4="http://schemas.microsoft.com/dsltools/Activity" xmlns:dm5="http://schemas.microsoft.com/dsltools/Interaction" xmlns:dm6="http://schemas.microsoft.com/dsltools/UmlModelLibrary" xmlns:dm7="http://schemas.microsoft.com/dsltools/UmlDiagrams" xmlns:dm8="http://schemas.microsoft.com/VisualStudio/TeamArchitect/SequenceDesigner" xmlns:dm9="http://schemas.microsoft.com/dsltools/LogicalClassDesigner"
+<package xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" xmlns:dm1="http://schemas.microsoft.com/dsltools/Kernel" xmlns:dm2="http://schemas.microsoft.com/dsltools/Component" xmlns:dm3="http://schemas.microsoft.com/dsltools/UseCase" xmlns:dm4="http://schemas.microsoft.com/dsltools/Activity" xmlns:dm5="http://schemas.microsoft.com/dsltools/Interaction" xmlns:dm6="http://schemas.microsoft.com/dsltools/UmlModelLibrary" xmlns:dm7="http://schemas.microsoft.com/dsltools/UmlDiagrams" xmlns:dm8="http://schemas.microsoft.com/dsltools/LogicalClassDesigner"
   dslVersion="1.0.0.0"
   Id="b0206019-0e88-4e4d-bed6-966671e5581c"
   name="Cockpit"
@@ -65,7 +65,7 @@
             isSubstitutable="false">
             <interfaceMoniker
               Id="a1f0ad20-7cb9-47ae-b788-4c64b9cab5ec"
-              LastKnownName="IVehicleCockpit"
+              LastKnownName="IVehicleInfo"
               LastKnownLocation="Package_1320.uml" />
           </generalization>
           <generalization
@@ -73,7 +73,7 @@
             isSubstitutable="false">
             <interfaceMoniker
               Id="79a658b1-b882-44ef-a566-26601c4e84ac"
-              LastKnownName="IGearboxCockpit"
+              LastKnownName="IGearboxInfo"
               LastKnownLocation="Package_1320.uml" />
           </generalization>
           <generalization
@@ -81,7 +81,7 @@
             isSubstitutable="false">
             <interfaceMoniker
               Id="b5369ef2-53be-474a-b7ae-d1e22c21bc69"
-              LastKnownName="IEngineCockpit"
+              LastKnownName="IEngineInfo"
               LastKnownLocation="Package_1320.uml" />
           </generalization>
         </generalsInternal>
@@ -90,7 +90,7 @@
     <packageHasNamedElement>
       <Interface
         Id="a1f0ad20-7cb9-47ae-b788-4c64b9cab5ec"
-        name="IVehicleCockpit"
+        name="IVehicleInfo"
         isAbstract="false"
         isLeaf="false">
         <referencesInternal>
@@ -458,7 +458,7 @@
     <packageHasNamedElement>
       <Interface
         Id="79a658b1-b882-44ef-a566-26601c4e84ac"
-        name="IGearboxCockpit"
+        name="IGearboxInfo"
         isAbstract="false"
         isLeaf="false">
         <referencesInternal>
@@ -589,7 +589,7 @@
     <packageHasNamedElement>
       <Interface
         Id="b5369ef2-53be-474a-b7ae-d1e22c21bc69"
-        name="IEngineCockpit"
+        name="IEngineInfo"
         isAbstract="false"
         isLeaf="false">
         <referencesInternal>
diff --git a/VectoCoreArchitecture/ModelDefinition/VectoArchitecture.uml b/VectoCoreArchitecture/ModelDefinition/VectoArchitecture.uml
index 1e4aa7b772c4b6ef301615802b707ab2e5323e9a..243d2f6848438724a51868fec800873ca7379a29 100644
--- a/VectoCoreArchitecture/ModelDefinition/VectoArchitecture.uml
+++ b/VectoCoreArchitecture/ModelDefinition/VectoArchitecture.uml
@@ -12276,7 +12276,7 @@ Start Step 3...</body>
             <type_NamedElement>
               <interfaceMoniker
                 Id="b5369ef2-53be-474a-b7ae-d1e22c21bc69"
-                LastKnownName="IEngineCockpit"
+                LastKnownName="IEngineInfo"
                 LastKnownLocation="Package_1320.uml" />
             </type_NamedElement>
           </property>
@@ -12343,7 +12343,7 @@ Start Step 3...</body>
             <type_NamedElement>
               <interfaceMoniker
                 Id="79a658b1-b882-44ef-a566-26601c4e84ac"
-                LastKnownName="IGearboxCockpit"
+                LastKnownName="IGearboxInfo"
                 LastKnownLocation="Package_1320.uml" />
             </type_NamedElement>
           </property>
@@ -12410,7 +12410,7 @@ Start Step 3...</body>
             <type_NamedElement>
               <interfaceMoniker
                 Id="a1f0ad20-7cb9-47ae-b788-4c64b9cab5ec"
-                LastKnownName="IVehicleCockpit"
+                LastKnownName="IVehicleInfo"
                 LastKnownLocation="Package_1320.uml" />
             </type_NamedElement>
           </property>
diff --git a/VectoCoreArchitecture/Overview.classdiagram b/VectoCoreArchitecture/Overview.classdiagram
index e72fd4dc668482d1d88e9c883750890f2b1d922a..08ebaa8187f32f2ac1dc4f41d394b63f67f37124 100644
--- a/VectoCoreArchitecture/Overview.classdiagram
+++ b/VectoCoreArchitecture/Overview.classdiagram
@@ -4404,7 +4404,7 @@
                   </appliedStereotypesInternal>
                   <elementDefinition Id="76418716-f048-429a-bab9-6bd31f8a6dd3" />
                   <type_NamedElement>
-                    <referencedTypeMoniker Id="02bec912-78e6-4b54-82da-2eebff22d4e1" LastKnownName="IEngineCockpit" />
+                    <referencedTypeMoniker Id="02bec912-78e6-4b54-82da-2eebff22d4e1" LastKnownName="IEngineInfo" />
                   </type_NamedElement>
                 </property>
                 <property Id="ae2eb5ec-2c16-40ca-899f-e747f8a59eae" name="_gearbox" visibility="Package" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
@@ -4452,7 +4452,7 @@
                   </appliedStereotypesInternal>
                   <elementDefinition Id="a7b36236-0d97-443c-92a5-f466d2ccac47" />
                   <type_NamedElement>
-                    <referencedTypeMoniker Id="26db8af8-ff31-4855-9247-8555c8ec3cb4" LastKnownName="IGearboxCockpit" />
+                    <referencedTypeMoniker Id="26db8af8-ff31-4855-9247-8555c8ec3cb4" LastKnownName="IGearboxInfo" />
                   </type_NamedElement>
                 </property>
                 <property Id="175147c7-2e15-4fb2-9526-50ccf85b49fa" name="_vehicle" visibility="Package" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
@@ -4500,7 +4500,7 @@
                   </appliedStereotypesInternal>
                   <elementDefinition Id="9f9423cd-4238-48fe-89c7-4bb84d6e1f94" />
                   <type_NamedElement>
-                    <referencedTypeMoniker Id="e2f0659a-8e9c-4b2b-80c2-a1ba122219e2" LastKnownName="IVehicleCockpit" />
+                    <referencedTypeMoniker Id="e2f0659a-8e9c-4b2b-80c2-a1ba122219e2" LastKnownName="IVehicleInfo" />
                   </type_NamedElement>
                 </property>
                 <property Id="1159ad4b-3336-4e99-ab80-6e5976ea9a86" name="_cycle" visibility="Package" isLeaf="false" isStatic="false" isReadOnly="false" isDerived="false" isDerivedUnion="false" aggregation="None" isComposite="false">
@@ -15962,7 +15962,7 @@
               <elementDefinition Id="73c2fd70-49e4-4dea-b4b8-1df3906d4ea6" />
               <generalsInternal>
                 <generalization Id="c7e82475-0fc0-4762-a108-ea6d4b69404c" isSubstitutable="false">
-                  <interfaceMoniker Id="44c937c7-7125-4968-85a6-6b035c8458f5" LastKnownName="IGearboxCockpit" />
+                  <interfaceMoniker Id="44c937c7-7125-4968-85a6-6b035c8458f5" LastKnownName="IGearboxInfo" />
                   <elementDefinition Id="1de7a3c6-37c9-44c5-a473-bf4136586f3f" />
                 </generalization>
               </generalsInternal>
@@ -16009,7 +16009,7 @@
               <elementDefinition Id="8f855aba-1ce7-4f09-af2f-87bc7ff37281" />
               <generalsInternal>
                 <generalization Id="8c051524-0d3d-44fd-aff6-33253dd7e90a" isSubstitutable="false">
-                  <interfaceMoniker Id="abb5e42b-c7d3-4cf6-ba34-8ce679074477" LastKnownName="IEngineCockpit" />
+                  <interfaceMoniker Id="abb5e42b-c7d3-4cf6-ba34-8ce679074477" LastKnownName="IEngineInfo" />
                   <elementDefinition Id="46f1d015-b201-4dd3-98e0-40613d22226c" />
                 </generalization>
               </generalsInternal>
@@ -20129,7 +20129,7 @@
               <elementDefinition Id="567a2cb4-78fa-447b-abdb-78cd1965d5dc" />
               <generalsInternal>
                 <generalization Id="cff3c187-978f-4c9c-b998-5eb0efd790fa" isSubstitutable="false">
-                  <interfaceMoniker Id="fcdc90f8-cb35-4b36-b566-21f67561939d" LastKnownName="IVehicleCockpit" />
+                  <interfaceMoniker Id="fcdc90f8-cb35-4b36-b566-21f67561939d" LastKnownName="IVehicleInfo" />
                   <elementDefinition Id="49e1a334-e2b0-4764-b95d-dd0bbac89592" />
                 </generalization>
               </generalsInternal>
@@ -26035,22 +26035,22 @@
               <elementDefinition Id="5dcabc72-51e3-41e6-b0c3-faad36b7eea8" />
               <generalsInternal>
                 <generalization Id="3af3dcf1-5a9d-4416-a19e-426b62073f17" isSubstitutable="false">
-                  <interfaceMoniker Id="fcdc90f8-cb35-4b36-b566-21f67561939d" LastKnownName="IVehicleCockpit" />
+                  <interfaceMoniker Id="fcdc90f8-cb35-4b36-b566-21f67561939d" LastKnownName="IVehicleInfo" />
                   <elementDefinition Id="a015d786-bc53-481d-a971-4a76b20930ad" />
                 </generalization>
                 <generalization Id="fd0e1928-0bc7-4154-a294-cdea0a82b696" isSubstitutable="false">
-                  <interfaceMoniker Id="44c937c7-7125-4968-85a6-6b035c8458f5" LastKnownName="IGearboxCockpit" />
+                  <interfaceMoniker Id="44c937c7-7125-4968-85a6-6b035c8458f5" LastKnownName="IGearboxInfo" />
                   <elementDefinition Id="c2374846-2641-4784-a9f4-be8b181aefd4" />
                 </generalization>
                 <generalization Id="e91134b3-31b1-4833-89c6-a2f8e606bb3b" isSubstitutable="false">
-                  <interfaceMoniker Id="abb5e42b-c7d3-4cf6-ba34-8ce679074477" LastKnownName="IEngineCockpit" />
+                  <interfaceMoniker Id="abb5e42b-c7d3-4cf6-ba34-8ce679074477" LastKnownName="IEngineInfo" />
                   <elementDefinition Id="2959c9c7-42dd-4bbe-a11c-cc566e0e78bd" />
                 </generalization>
               </generalsInternal>
             </Interface>
           </packageHasNamedElement>
           <packageHasNamedElement>
-            <Interface Id="abb5e42b-c7d3-4cf6-ba34-8ce679074477" name="IEngineCockpit" isAbstract="false" isLeaf="false">
+            <Interface Id="abb5e42b-c7d3-4cf6-ba34-8ce679074477" name="IEngineInfo" isAbstract="false" isLeaf="false">
               <referencesInternal>
                 <reference Id="c8039485-17d9-4d0e-9adf-4a554e50307d" handle="viewcode://./CodeSchema_Interface?Assembly%3Dfile:%2F%2F%2FC:%2Fvecto%2FVectoCore%2Fbin%2FDebug%2FVectoCore.dll Namespace%3DTUGraz.VectoCore.Models.Simulation.Cockpit Type%3DIEngineCockpit" tag="ViewCode">
                   <elementDefinition Id="ae002fb0-1d11-4f10-a6ea-69ae53b669d4" />
@@ -26154,7 +26154,7 @@
             </Interface>
           </packageHasNamedElement>
           <packageHasNamedElement>
-            <Interface Id="44c937c7-7125-4968-85a6-6b035c8458f5" name="IGearboxCockpit" isAbstract="false" isLeaf="false">
+            <Interface Id="44c937c7-7125-4968-85a6-6b035c8458f5" name="IGearboxInfo" isAbstract="false" isLeaf="false">
               <referencesInternal>
                 <reference Id="c4a67519-ad95-4ae6-9ca6-19912abd2d13" handle="viewcode://./CodeSchema_Interface?Assembly%3Dfile:%2F%2F%2FC:%2Fvecto%2FVectoCore%2Fbin%2FDebug%2FVectoCore.dll Namespace%3DTUGraz.VectoCore.Models.Simulation.Cockpit Type%3DIGearboxCockpit" tag="ViewCode">
                   <elementDefinition Id="95e15992-611b-4d01-b4a0-7637f0d3a489" />
@@ -26258,7 +26258,7 @@
             </Interface>
           </packageHasNamedElement>
           <packageHasNamedElement>
-            <Interface Id="fcdc90f8-cb35-4b36-b566-21f67561939d" name="IVehicleCockpit" isAbstract="false" isLeaf="false">
+            <Interface Id="fcdc90f8-cb35-4b36-b566-21f67561939d" name="IVehicleInfo" isAbstract="false" isLeaf="false">
               <referencesInternal>
                 <reference Id="74241151-868b-45ab-b105-8c773527a906" handle="viewcode://./CodeSchema_Interface?Assembly%3Dfile:%2F%2F%2FC:%2Fvecto%2FVectoCore%2Fbin%2FDebug%2FVectoCore.dll Namespace%3DTUGraz.VectoCore.Models.Simulation.Cockpit Type%3DIVehicleCockpit" tag="ViewCode">
                   <elementDefinition Id="186563fa-e777-4496-9194-21f5d8becb64" />
@@ -28115,17 +28115,17 @@
       </referencedType>
     </packageHasNamedElement>
     <packageHasNamedElement>
-      <referencedType Id="02bec912-78e6-4b54-82da-2eebff22d4e1" name="IEngineCockpit" isAbstract="false" isLeaf="false" cachedFullName="VectoArchitecture::TUGraz::VectoCore::Models::Simulation::Cockpit::IEngineCockpit">
+      <referencedType Id="02bec912-78e6-4b54-82da-2eebff22d4e1" name="IEngineInfo" isAbstract="false" isLeaf="false" cachedFullName="VectoArchitecture::TUGraz::VectoCore::Models::Simulation::Cockpit::IEngineInfo">
         <elementDefinition Id="b5369ef2-53be-474a-b7ae-d1e22c21bc69" />
       </referencedType>
     </packageHasNamedElement>
     <packageHasNamedElement>
-      <referencedType Id="26db8af8-ff31-4855-9247-8555c8ec3cb4" name="IGearboxCockpit" isAbstract="false" isLeaf="false" cachedFullName="VectoArchitecture::TUGraz::VectoCore::Models::Simulation::Cockpit::IGearboxCockpit">
+      <referencedType Id="26db8af8-ff31-4855-9247-8555c8ec3cb4" name="IGearboxInfo" isAbstract="false" isLeaf="false" cachedFullName="VectoArchitecture::TUGraz::VectoCore::Models::Simulation::Cockpit::IGearboxInfo">
         <elementDefinition Id="79a658b1-b882-44ef-a566-26601c4e84ac" />
       </referencedType>
     </packageHasNamedElement>
     <packageHasNamedElement>
-      <referencedType Id="e2f0659a-8e9c-4b2b-80c2-a1ba122219e2" name="IVehicleCockpit" isAbstract="false" isLeaf="false" cachedFullName="VectoArchitecture::TUGraz::VectoCore::Models::Simulation::Cockpit::IVehicleCockpit">
+      <referencedType Id="e2f0659a-8e9c-4b2b-80c2-a1ba122219e2" name="IVehicleInfo" isAbstract="false" isLeaf="false" cachedFullName="VectoArchitecture::TUGraz::VectoCore::Models::Simulation::Cockpit::IVehicleInfo">
         <elementDefinition Id="a1f0ad20-7cb9-47ae-b788-4c64b9cab5ec" />
       </referencedType>
     </packageHasNamedElement>
diff --git a/VectoCoreArchitecture/Overview.classdiagram.layout b/VectoCoreArchitecture/Overview.classdiagram.layout
index f59be36977e0acd60f6e6869f8e911285cd0f36e..895074634d496332857c8149849af151cb725044 100644
--- a/VectoCoreArchitecture/Overview.classdiagram.layout
+++ b/VectoCoreArchitecture/Overview.classdiagram.layout
@@ -301,7 +301,7 @@
         </classShape>
       </nestedChildShapes>
     </packageShape>
-    <associationConnector edgePoints="[(18 : 15.3400115249554); (19 : 15.3400115249554)]" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110" sourceMultiplicity="1" targetMultiplicity="1">
+    <associationConnector edgePoints="[(18 : 15.3400115249554); (19 : 15.3400115249554)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" sourceMultiplicity="1" targetMultiplicity="1">
       <associationMoniker Id="41a7940f-652d-431b-93f1-e2b2614053f9" />
       <relativeChildShapes />
       <nodes>
@@ -309,7 +309,7 @@
         <classShapeMoniker Id="376a9d3c-4d9f-4ac7-8b74-8c9c78dea105" />
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(15.25 : 14.7794646673401); (14.5 : 14.7794646673401)]" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110" sourceMultiplicity="*" targetMultiplicity="1">
+    <associationConnector edgePoints="[(15.25 : 14.7794646673401); (14.5 : 14.7794646673401)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" sourceMultiplicity="*" targetMultiplicity="1">
       <associationMoniker Id="552c5ed0-32bb-4197-b2e6-67022e189443" />
       <relativeChildShapes />
       <nodes>
@@ -325,7 +325,7 @@
         <interfaceShapeMoniker Id="1c14b267-21e0-45f5-8ece-cb1a98606f31" />
       </nodes>
     </realizationConnector>
-    <associationConnector edgePoints="[(16.625 : 13.4065855002403); (16.625 : 13.625)]" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110" sourceMultiplicity="1" targetMultiplicity="1">
+    <associationConnector edgePoints="[(16.625 : 13.4065855002403); (16.625 : 13.625)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" sourceMultiplicity="1" targetMultiplicity="1">
       <associationMoniker Id="8203b44d-94f2-4620-8f58-45e310a59f92" />
       <relativeChildShapes />
       <nodes>
@@ -333,7 +333,7 @@
         <classShapeMoniker Id="60b3d668-ce06-44ca-bac8-3f639a39f177" />
       </nodes>
     </associationConnector>
-    <realizationConnector edgePoints="[(4.37377711573956 : 11.375); (4.37377711573956 : 11.1403471940756); (4.375 : 11.1403471940756); (4.375 : 10.8403471940756)]" fixedFrom="Caller" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(4.37377711573956 : 11.375); (4.37377711573956 : 11.1403471940756); (4.375 : 11.1403471940756); (4.375 : 10.8403471940756)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="71669950-2ecf-4203-a9b9-586c2b39f950" />
       <relativeChildShapes />
       <nodes>
@@ -341,7 +341,7 @@
         <interfaceShapeMoniker Id="cf28e5d4-3162-40c0-b6dd-de0308581896" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(2.125 : 7.625); (2.125 : 7.49394719407559); (2.12165534388031 : 7.49394719407559); (2.12165534388031 : 7.34034719407559)]" fixedFrom="NotFixed" fixedTo="Caller" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(2.125 : 7.625); (2.125 : 7.49394719407559); (2.12165534388031 : 7.49394719407559); (2.12165534388031 : 7.34034719407559)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="244fc219-da12-4816-81c7-4b92e2e8be36" />
       <relativeChildShapes />
       <nodes>
@@ -349,7 +349,7 @@
         <interfaceShapeMoniker Id="9eb9f54b-1a0a-4b12-8d81-920d548142d3" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(4.93928951935415 : 11.375); (4.93928951935415 : 11.1403471940756); (4.93549249974635 : 11.1403471940756); (4.93549249974635 : 10.8403471940756)]" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(4.93928951935415 : 11.375); (4.93928951935415 : 11.1403471940756); (4.93549249974635 : 11.1403471940756); (4.93549249974635 : 10.8403471940756)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="b37653ef-be9d-494a-9461-e31381abe537" />
       <relativeChildShapes />
       <nodes>
@@ -365,7 +365,7 @@
         <interfaceShapeMoniker Id="7749fb8c-6050-4c9e-a945-aea8abe04406" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(9.37311056220283 : 7.75); (9.37311056220283 : 7.51534719407558); (9.375 : 7.51534719407558); (9.375 : 7.21534719407558)]" fixedFrom="Caller" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(9.37311056220283 : 7.75); (9.37311056220283 : 7.51534719407558); (9.375 : 7.51534719407558); (9.375 : 7.21534719407558)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="5fb98141-6885-45e9-92b8-1129242753f5" />
       <relativeChildShapes />
       <nodes>
@@ -373,7 +373,7 @@
         <interfaceShapeMoniker Id="24b24a21-2f74-4c06-8b84-79b37d65840d" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(8.43194854082859 : 17.5); (8.43194854082859 : 17.0831246848314); (7.5 : 17.0831246848314)]" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(8.43194854082859 : 17.5); (8.43194854082859 : 17.0831246848314); (7.5 : 17.0831246848314)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="d522b24b-f44e-4bb1-a3d6-96c0b9bcdf64" />
       <relativeChildShapes />
       <nodes>
@@ -381,7 +381,7 @@
         <interfaceShapeMoniker Id="a1c0144d-937e-4750-b6e2-e5f3696a086b" />
       </nodes>
     </realizationConnector>
-    <generalizationConnector edgePoints="[(14.5117251627485 : 8.375); (14.5120586029937 : 7.79330435454845)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(14.5117251627485 : 8.375); (14.5120586029937 : 7.79330435454845)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="7902e6be-dc38-4f31-9cec-e6ce76893353" />
       <relativeChildShapes />
       <nodes>
@@ -389,7 +389,7 @@
         <classShapeMoniker Id="d857861f-ffa2-4c7c-94a8-765c2dad6d6c" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(3 : 11.375); (3 : 5.37349936836648); (4.54166666666667 : 5.37349936836648 : JumpStart); (4.70833333333333 : 5.37349936836648 : JumpEnd); (6.29084818384219 : 5.37349936836648 : JumpStart); (6.47019662034815 : 5.37349936836648 : JumpEnd); (7.83531996348196 : 5.37349936836648 : JumpStart); (8.00198663014863 : 5.37349936836648 : JumpEnd); (9.29166666666667 : 5.37349936836648 : JumpStart); (9.45833333333333 : 5.37349936836648 : JumpEnd); (10.7688775171379 : 5.37349936836648 : JumpStart); (10.9355441838046 : 5.37349936836648 : JumpEnd); (13 : 5.37349936836648); (13 : 6.125)]" manuallyRouted="true" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(3 : 11.375); (3 : 5.37349936836648); (4.54166666666667 : 5.37349936836648 : JumpStart); (4.70833333333333 : 5.37349936836648 : JumpEnd); (6.2908481838422 : 5.37349936836648 : JumpStart); (6.47019662034815 : 5.37349936836648 : JumpEnd); (7.83531996348196 : 5.37349936836648 : JumpStart); (8.00198663014862 : 5.37349936836648 : JumpEnd); (9.29166666666667 : 5.37349936836648 : JumpStart); (9.45833333333333 : 5.37349936836648 : JumpEnd); (10.768877517138 : 5.37349936836648 : JumpStart); (10.9355441838046 : 5.37349936836648 : JumpEnd); (13 : 5.37349936836648); (13 : 6.125)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="b1b6a6a9-cf62-4285-94fb-82cf2a2402a3" />
       <relativeChildShapes />
       <nodes>
@@ -397,7 +397,7 @@
         <classShapeMoniker Id="d857861f-ffa2-4c7c-94a8-765c2dad6d6c" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(2.875 : 8.34946708672724); (2.91666666666667 : 8.34946708672724 : JumpStart); (3.08333333333333 : 8.34946708672724 : JumpEnd); (3.625 : 8.34946708672724); (3.625 : 9.37999993925095); (5.54166666666667 : 9.37999993925095 : JumpStart); (5.70833333333333 : 9.37999993925095 : JumpEnd); (6.29084818384219 : 9.37999993925095 : JumpStart); (6.47019662034815 : 9.37999993925095 : JumpEnd); (6.64457444572343 : 9.37999993925095 : JumpStart); (6.81124111239009 : 9.37999993925095 : JumpEnd); (7.25999992022514 : 9.37999993925095); (7.25999992022514 : 7.48355964752963); (7.83531996348196 : 7.48355964752963 : JumpStart); (8.00198663014863 : 7.48355964752963 : JumpEnd); (10.7688775171379 : 7.48355964752963 : JumpStart); (10.9355441838046 : 7.48355964752963 : JumpEnd); (11.25 : 7.48355964752963)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(2.875 : 8.34946708672724); (2.91666666666667 : 8.34946708672724 : JumpStart); (3.08333333333333 : 8.34946708672724 : JumpEnd); (3.625 : 8.34946708672724); (3.625 : 9.37999993925095); (5.54166666666667 : 9.37999993925095 : JumpStart); (5.70833333333333 : 9.37999993925095 : JumpEnd); (6.2908481838422 : 9.37999993925095 : JumpStart); (6.47019662034815 : 9.37999993925095 : JumpEnd); (6.64457444572343 : 9.37999993925095 : JumpStart); (6.81124111239009 : 9.37999993925095 : JumpEnd); (7.25999992022514 : 9.37999993925095); (7.25999992022514 : 7.48355964752963); (7.83531996348196 : 7.48355964752963 : JumpStart); (8.00198663014862 : 7.48355964752963 : JumpEnd); (10.768877517138 : 7.48355964752963 : JumpStart); (10.9355441838046 : 7.48355964752963 : JumpEnd); (11.25 : 7.48355964752963)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="2695a5f6-ea9b-4b8f-bd93-8fa85823bb09" />
       <relativeChildShapes />
       <nodes>
@@ -405,7 +405,7 @@
         <classShapeMoniker Id="d857861f-ffa2-4c7c-94a8-765c2dad6d6c" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(6.72790777905676 : 11.375); (6.72790777905676 : 7.32103806250624); (7.83531996348196 : 7.32103806250624 : JumpStart); (8.00198663014863 : 7.32103806250624 : JumpEnd); (9.29166666666667 : 7.32103806250624 : JumpStart); (9.45833333333333 : 7.32103806250624 : JumpEnd); (10.7688775171379 : 7.32103806250624 : JumpStart); (10.9355441838046 : 7.32103806250624 : JumpEnd); (11.25 : 7.32103806250624)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(6.72790777905676 : 11.375); (6.72790777905676 : 7.32103806250624); (7.83531996348196 : 7.32103806250624 : JumpStart); (8.00198663014862 : 7.32103806250624 : JumpEnd); (9.29166666666667 : 7.32103806250624 : JumpStart); (9.45833333333333 : 7.32103806250624 : JumpEnd); (10.768877517138 : 7.32103806250624 : JumpStart); (10.9355441838046 : 7.32103806250624 : JumpEnd); (11.25 : 7.32103806250624)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="002c19fb-4013-4cb2-934b-c1b818d5c796" />
       <relativeChildShapes />
       <nodes>
@@ -413,7 +413,7 @@
         <classShapeMoniker Id="d857861f-ffa2-4c7c-94a8-765c2dad6d6c" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(5.375 : 7.33114587601379); (5.54166666666667 : 7.33114587601379 : JumpStart); (5.70833333333333 : 7.33114587601379 : JumpEnd); (6.29084818384219 : 7.33114587601379 : JumpStart); (6.47019662034815 : 7.33114587601379 : JumpEnd); (7.83531996348196 : 7.33114587601379 : JumpStart); (8.00198663014863 : 7.33114587601379 : JumpEnd); (9.29166666666667 : 7.33114587601379 : JumpStart); (9.45833333333333 : 7.33114587601379 : JumpEnd); (10.7688775171379 : 7.33114587601379 : JumpStart); (10.9355441838046 : 7.33114587601379 : JumpEnd); (11.25 : 7.33114587601379)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Algorithm" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(5.375 : 7.33114587601379); (5.54166666666667 : 7.33114587601379 : JumpStart); (5.70833333333333 : 7.33114587601379 : JumpEnd); (6.2908481838422 : 7.33114587601379 : JumpStart); (6.47019662034815 : 7.33114587601379 : JumpEnd); (7.83531996348196 : 7.33114587601379 : JumpStart); (8.00198663014862 : 7.33114587601379 : JumpEnd); (9.29166666666667 : 7.33114587601379 : JumpStart); (9.45833333333333 : 7.33114587601379 : JumpEnd); (10.768877517138 : 7.33114587601379 : JumpStart); (10.9355441838046 : 7.33114587601379 : JumpEnd); (11.25 : 7.33114587601379)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="942cc6ba-ee9c-44cb-877a-9607f88aa4a8" />
       <relativeChildShapes />
       <nodes>
@@ -421,7 +421,7 @@
         <classShapeMoniker Id="d857861f-ffa2-4c7c-94a8-765c2dad6d6c" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(13.125 : 10.5505831559029); (13.3213031797951 : 10.5505831559029); (13.3213031797951 : 7.79330435454845)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(13.125 : 10.5505831559029); (13.3213031797951 : 10.5505831559029); (13.3213031797951 : 7.79330435454845)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="b2de63a1-0e7c-4f9a-8b3f-5abb4b108f02" />
       <relativeChildShapes />
       <nodes>
@@ -429,7 +429,7 @@
         <classShapeMoniker Id="d857861f-ffa2-4c7c-94a8-765c2dad6d6c" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(10.5 : 7.95257853944549); (10.7802000861923 : 7.78938960314784 : JumpStart); (10.9242216147502 : 7.70551125618261 : JumpEnd); (11.25 : 7.5157774524564)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(10.5 : 7.95257853944549); (10.7802000861923 : 7.78938960314782 : JumpStart); (10.9242216147503 : 7.70551125618258 : JumpEnd); (11.25 : 7.5157774524564)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="a29c9342-830f-4ebd-a844-9af904441ec1" />
       <relativeChildShapes />
       <nodes>
@@ -437,7 +437,7 @@
         <classShapeMoniker Id="d857861f-ffa2-4c7c-94a8-765c2dad6d6c" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(10.7447587635724 : 17.5); (10.7447587635724 : 8.16830435454845); (10.7688775171379 : 8.16830435454845 : JumpStart); (10.9355441838046 : 8.16830435454845 : JumpEnd); (13 : 8.16830435454845); (13 : 7.79330435454845)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Algorithm" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(10.7447587635724 : 17.5); (10.7447587635724 : 8.16830435454845); (10.768877517138 : 8.16830435454845 : JumpStart); (10.9355441838046 : 8.16830435454845 : JumpEnd); (13 : 8.16830435454845); (13 : 7.79330435454845)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="40d3efc2-7cf3-4483-9f2c-83e71617fb70" />
       <relativeChildShapes />
       <nodes>
@@ -445,7 +445,7 @@
         <classShapeMoniker Id="d857861f-ffa2-4c7c-94a8-765c2dad6d6c" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(14.6685568381379 : 17.375); (14.6685568381379 : 16.6628702546017); (11.1298467933355 : 16.6628702546017); (11.1298467933355 : 12.7542418247461); (13.7142670382438 : 12.7542418247461); (13.7142670382438 : 7.79330435454845)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(14.6685568381379 : 17.375); (14.6685568381379 : 16.6628702546017); (11.1298467933355 : 16.6628702546017); (11.1298467933355 : 12.7542418247461); (13.7142670382438 : 12.7542418247461); (13.7142670382438 : 7.79330435454845)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="e5ad71d5-c8e1-45ce-a73d-ffe803fe07a2" />
       <relativeChildShapes />
       <nodes>
@@ -453,7 +453,7 @@
         <classShapeMoniker Id="d857861f-ffa2-4c7c-94a8-765c2dad6d6c" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(17.8125 : 17.625); (17.8125 : 17.2550230499109); (14.9595834464576 : 17.2550230499109); (14.9595834464576 : 16.3686718804765); (11.6042428777261 : 16.3686718804765); (11.6042428777261 : 13.425); (13.9615869824418 : 13.425); (13.9615869824418 : 7.79330435454845)]" manuallyRouted="true" fixedFrom="Algorithm" fixedTo="Caller" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(17.8125 : 17.625); (17.8125 : 17.2550230499109); (14.9595834464576 : 17.2550230499109); (14.9595834464576 : 16.3686718804765); (11.6042428777261 : 16.3686718804765); (11.6042428777261 : 13.425); (13.9615869824418 : 13.425); (13.9615869824418 : 7.79330435454845)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="1d2d90a6-6e1a-46b1-b6d1-d04859466863" />
       <relativeChildShapes />
       <nodes>
@@ -494,7 +494,7 @@
         </interfaceShape>
       </nestedChildShapes>
     </packageShape>
-    <realizationConnector edgePoints="[(14.9895428563738 : 8.375); (14.9895428563738 : 4.575); (14.4246783993032 : 4.575 : JumpStart); (14.2580117326365 : 4.575 : JumpEnd); (13.425 : 4.575); (13.425 : 0.575); (6.45751485050886 : 0.574999999999999 : JumpStart); (6.29084818384219 : 0.575 : JumpEnd); (2.10561784283043 : 0.575); (2.10561784283043 : 0.875)]" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(14.9895428563738 : 8.375); (14.9895428563738 : 4.575); (14.4246783993031 : 4.575 : JumpStart); (14.2580117326365 : 4.575 : JumpEnd); (13.425 : 4.575); (13.425 : 0.575); (6.45751485050886 : 0.574999999999999 : JumpStart); (6.2908481838422 : 0.575 : JumpEnd); (2.10561784283043 : 0.575); (2.10561784283043 : 0.875)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="b144d5c1-109d-4326-ac25-7373030fbc9e" />
       <relativeChildShapes />
       <nodes>
@@ -502,7 +502,7 @@
         <interfaceShapeMoniker Id="3aaa94b9-dece-4500-98f9-ad9de92168e8" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(1.5 : 11.7568590066143); (0.302499992156029 : 11.7568590066143); (0.302499992156029 : 1.41748464807724); (0.875 : 1.41748464807724)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(1.5 : 11.7568590066143); (0.302499992156029 : 11.7568590066143); (0.302499992156029 : 1.41748464807724); (0.875 : 1.41748464807724)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="426d1412-1dd8-44b0-a831-1fa141d2a3cd" />
       <relativeChildShapes />
       <nodes>
@@ -510,7 +510,7 @@
         <interfaceShapeMoniker Id="3aaa94b9-dece-4500-98f9-ad9de92168e8" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(1.375 : 7.91826464864495); (0.958333333333333 : 7.91826464864494 : JumpStart); (0.791666666666667 : 7.91826464864495 : JumpEnd); (0.5 : 7.91826464864495); (0.5 : 1.6487930518348); (0.875 : 1.6487930518348)]" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(1.375 : 7.91826464864495); (0.958333333333333 : 7.91826464864495 : JumpStart); (0.791666666666667 : 7.91826464864495 : JumpEnd); (0.5 : 7.91826464864495); (0.5 : 1.6487930518348); (0.875 : 1.6487930518348)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="8b624912-72d4-4989-b390-d0617ce50964" />
       <relativeChildShapes />
       <nodes>
@@ -518,7 +518,7 @@
         <interfaceShapeMoniker Id="3aaa94b9-dece-4500-98f9-ad9de92168e8" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(6.37418151717553 : 11.375); (6.37418151717553 : 0.312499995827675); (1.38332401253558 : 0.312499995827675); (1.38332401253558 : 0.875)]" manuallyRouted="true" fixedFrom="Algorithm" fixedTo="Caller" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(6.37418151717553 : 11.375); (6.37418151717553 : 0.312499995827675); (1.38332401253558 : 0.312499995827675); (1.38332401253558 : 0.875)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="1856cc47-27e2-4634-8c12-507417bef46a" />
       <relativeChildShapes />
       <nodes>
@@ -526,7 +526,7 @@
         <interfaceShapeMoniker Id="3aaa94b9-dece-4500-98f9-ad9de92168e8" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(4.625 : 6.625); (4.625 : 5.17999977653026); (1.29299080302008 : 5.17999977653026 : JumpStart); (1.12632413635341 : 5.17999977653026 : JumpEnd); (0.958333333333333 : 5.17999977653026 : JumpStart); (0.791666666666667 : 5.17999977653026 : JumpEnd); (0.583333333333333 : 5.17999977653026 : JumpStart); (0.416666666666667 : 5.17999977653026 : JumpEnd); (0.385833325489362 : 5.17999977653026 : JumpStart); (0.219166658822695 : 5.17999977653026 : JumpEnd); (0.142812496995926 : 5.17999977653026); (0.142812496995926 : 0.986199634485383); (0.875 : 0.986199634485383)]" manuallyRouted="true" fixedFrom="Algorithm" fixedTo="Caller" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(4.625 : 6.625); (4.625 : 5.17999977653026); (1.29299080302008 : 5.17999977653026 : JumpStart); (1.12632413635342 : 5.17999977653026 : JumpEnd); (0.958333333333333 : 5.17999977653026 : JumpStart); (0.791666666666667 : 5.17999977653026 : JumpEnd); (0.583333333333333 : 5.17999977653026 : JumpStart); (0.416666666666667 : 5.17999977653026 : JumpEnd); (0.385833325489362 : 5.17999977653026 : JumpStart); (0.219166658822696 : 5.17999977653026 : JumpEnd); (0.142812496995926 : 5.17999977653026); (0.142812496995926 : 0.986199634485383); (0.875 : 0.986199634485383)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="ea3f1297-bdde-473d-a2cb-5e093bd4d50c" />
       <relativeChildShapes />
       <nodes>
@@ -534,7 +534,7 @@
         <interfaceShapeMoniker Id="3aaa94b9-dece-4500-98f9-ad9de92168e8" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(1.5 : 11.4794407306299); (0.875 : 11.4794407306299); (0.875 : 3.62550343910853)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Algorithm" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(1.5 : 11.4794407306299); (0.875 : 11.4794407306299); (0.875 : 3.62550343910853)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="ea3c99b9-6014-46f6-bb64-7949c569a713" />
       <relativeChildShapes />
       <nodes>
@@ -542,7 +542,7 @@
         <interfaceShapeMoniker Id="4eec3b45-1f7a-4152-bb45-7be1493950e2" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(1.375 : 7.72582257190838); (1.20965746968675 : 7.72582257190838); (1.20965746968675 : 3.62550343910853)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(1.375 : 7.72582257190838); (1.20965746968675 : 7.72582257190838); (1.20965746968675 : 3.62550343910853)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="3741d7ee-911b-4b22-a49d-9159baa69eae" />
       <relativeChildShapes />
       <nodes>
@@ -550,7 +550,7 @@
         <interfaceShapeMoniker Id="4eec3b45-1f7a-4152-bb45-7be1493950e2" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(6.38686328701482 : 11.375); (6.38686328701482 : 4.22737836020986); (2.48854764668279 : 4.22737836020986); (2.48854764668279 : 3.62550343910853)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(6.38686328701482 : 11.375); (6.38686328701482 : 4.22737836020986); (2.48854764668279 : 4.22737836020986); (2.48854764668279 : 3.62550343910853)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="c702aaba-46c6-4dab-b9de-55bd0df0e0a7" />
       <relativeChildShapes />
       <nodes>
@@ -558,7 +558,7 @@
         <interfaceShapeMoniker Id="4eec3b45-1f7a-4152-bb45-7be1493950e2" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(4.625 : 6.625); (4.625 : 4.95300319844881); (2.09377311035481 : 4.95300319844881); (2.09377311035481 : 3.62550343910853)]" manuallyRouted="true" fixedFrom="Algorithm" fixedTo="Caller" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(4.625 : 6.625); (4.625 : 4.95300319844881); (2.09377311035481 : 4.95300319844881); (2.09377311035481 : 3.62550343910853)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="58ff5da7-9a56-4420-9a64-4e3ae06b3008" />
       <relativeChildShapes />
       <nodes>
@@ -566,7 +566,7 @@
         <interfaceShapeMoniker Id="4eec3b45-1f7a-4152-bb45-7be1493950e2" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(11.625 : 10.2075826327357); (10.8522108504713 : 10.2075826327357); (10.8522108504713 : 4.71800335415999); (9.45833333333333 : 4.71800335415999 : JumpStart); (9.29166666666667 : 4.71800335415999 : JumpEnd); (8.00198663014863 : 4.71800335415999 : JumpStart); (7.83531996348196 : 4.71800335415999 : JumpEnd); (6.47019662034815 : 4.71800335415999 : JumpStart); (6.29084818384219 : 4.71800335415999 : JumpEnd); (2.3245880121387 : 4.71800335415999); (2.3245880121387 : 3.62550343910853)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(11.625 : 10.2075826327357); (10.8522108504713 : 10.2075826327357); (10.8522108504713 : 4.71800335415999); (9.45833333333333 : 4.71800335415999 : JumpStart); (9.29166666666667 : 4.71800335415999 : JumpEnd); (8.00198663014862 : 4.71800335415999 : JumpStart); (7.83531996348196 : 4.71800335415999 : JumpEnd); (6.47019662034815 : 4.71800335415999 : JumpStart); (6.2908481838422 : 4.71800335415999 : JumpEnd); (2.3245880121387 : 4.71800335415999); (2.3245880121387 : 3.62550343910853)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="ad9f6b13-d4a7-442c-a7ce-81e2af95fd82" />
       <relativeChildShapes />
       <nodes>
@@ -574,7 +574,7 @@
         <interfaceShapeMoniker Id="4eec3b45-1f7a-4152-bb45-7be1493950e2" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(7.91865329681529 : 7.75); (7.91865329681529 : 3.07012413938706); (6.45751485050886 : 3.07012413938706 : JumpStart); (6.29084818384219 : 3.07012413938706 : JumpEnd); (4.625 : 3.07012413938706)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(7.91865329681529 : 7.75); (7.91865329681529 : 3.07012413938706); (6.45751485050886 : 3.07012413938706 : JumpStart); (6.2908481838422 : 3.07012413938706 : JumpEnd); (4.625 : 3.07012413938706)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="b9c7c1d3-3bf5-49cb-b560-db463da0585b" />
       <relativeChildShapes />
       <nodes>
@@ -582,7 +582,7 @@
         <interfaceShapeMoniker Id="6141d0a5-5e18-4b11-ab8f-92299cc23008" />
       </nodes>
     </realizationConnector>
-    <realizationConnector edgePoints="[(11.625 : 10.2027424151471); (10.8522108504713 : 10.2027424151471); (10.8522108504713 : 1.52652264693202); (6.45751485050886 : 1.52652264693202 : JumpStart); (6.29084818384219 : 1.52652264693202 : JumpEnd); (4.625 : 1.52652264693202)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110" showAsLollipop="false">
+    <realizationConnector edgePoints="[(11.625 : 10.2027424151471); (10.8522108504713 : 10.2027424151471); (10.8522108504713 : 1.52652264693202); (6.45751485050886 : 1.52652264693202 : JumpStart); (6.2908481838422 : 1.52652264693202 : JumpEnd); (4.625 : 1.52652264693202)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110" showAsLollipop="false">
       <interfaceRealizationMoniker Id="79d125d0-b7b7-488b-ba89-f9164a796618" />
       <relativeChildShapes />
       <nodes>
@@ -594,21 +594,21 @@
       <packageMoniker Id="13840ff6-d020-4b62-92d5-a80df6fc932d" LastKnownName="Cockpit" />
       <nestedChildShapes>
         <interfaceShape Id="eb1a7045-c601-4045-b3c9-8b5ae6c737e3" absoluteBounds="13.75, 0.875, 2.25, 1.7309721742073694" hideQualifiedName="false" increaseHeight="0.18800345897674564" customColor="207, 223, 191">
-          <interfaceMoniker Id="fcdc90f8-cb35-4b36-b566-21f67561939d" LastKnownName="IVehicleCockpit" />
+          <interfaceMoniker Id="fcdc90f8-cb35-4b36-b566-21f67561939d" LastKnownName="IVehicleInfo" />
           <nestedChildShapes>
             <AttributeElementListCompartment Id="b6810d77-2713-4817-9bbe-c1e190212f5d" absoluteBounds="13.765, 1.4530034589767453, 2.2199999999999998, 0.2011718675494194" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
             <OperationElementListCompartment Id="6b32261e-3128-45c4-8d5a-0716022d2df2" absoluteBounds="13.765, 1.6641753265261645, 2.2199999999999998, 0.84179684768120444" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
           </nestedChildShapes>
         </interfaceShape>
         <interfaceShape Id="1171b11a-47db-4904-9f08-9f5f74aa6941" absoluteBounds="13.875, 3, 1.5, 1.2505034391085306" hideQualifiedName="false" increaseHeight="0.18800345897674564" customColor="207, 223, 191">
-          <interfaceMoniker Id="44c937c7-7125-4968-85a6-6b035c8458f5" LastKnownName="IGearboxCockpit" />
+          <interfaceMoniker Id="44c937c7-7125-4968-85a6-6b035c8458f5" LastKnownName="IGearboxInfo" />
           <nestedChildShapes>
             <AttributeElementListCompartment Id="a0214fc9-43bd-41e6-8f5c-5f00ebd4296c" absoluteBounds="13.89, 3.5780034589767453, 1.4700000000000002, 0.2011718675494194" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
             <OperationElementListCompartment Id="a3035284-ed7c-4ad4-9ceb-5ee80e85566d" absoluteBounds="13.89, 3.7891753265261645, 1.4700000000000002, 0.36132811258236563" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
           </nestedChildShapes>
         </interfaceShape>
         <interfaceShape Id="a10d63a4-cffa-4c71-a890-fcff49bc7d9f" absoluteBounds="15.625, 3, 2.125, 1.2505034391085306" hideQualifiedName="false" increaseHeight="0.18800345897674564" customColor="207, 223, 191">
-          <interfaceMoniker Id="abb5e42b-c7d3-4cf6-ba34-8ce679074477" LastKnownName="IEngineCockpit" />
+          <interfaceMoniker Id="abb5e42b-c7d3-4cf6-ba34-8ce679074477" LastKnownName="IEngineInfo" />
           <nestedChildShapes>
             <AttributeElementListCompartment Id="47b824d9-000f-488f-8bd9-14c59185632c" absoluteBounds="15.64, 3.5780034589767453, 2.0949999999999998, 0.2011718675494194" name="AttributesCompartment" titleTextColor="Black" itemTextColor="Black" />
             <OperationElementListCompartment Id="6fb7858c-ed11-4e75-b4d7-4dd2616dede5" absoluteBounds="15.64, 3.7891753265261645, 2.0949999999999998, 0.36132811258236563" name="OperationsCompartment" titleTextColor="Black" itemTextColor="Black" />
@@ -623,7 +623,7 @@
         </interfaceShape>
       </nestedChildShapes>
     </packageShape>
-    <generalizationConnector edgePoints="[(5.125 : 10.4045566171053); (5.625 : 10.4045566171053); (5.625 : 5.65300334698359); (6.29084818384219 : 5.65300334698359 : JumpStart); (6.47019662034815 : 5.65300334698359 : JumpEnd); (7.83531996348196 : 5.65300334698359 : JumpStart); (8.00198663014863 : 5.65300334698359 : JumpEnd); (9.29166666666667 : 5.65300334698359 : JumpStart); (9.45833333333333 : 5.65300334698359 : JumpEnd); (10.7688775171379 : 5.65300334698359 : JumpStart); (10.9355441838046 : 5.65300334698359 : JumpEnd); (12.9166666666667 : 5.65300334698359 : JumpStart); (13.0833333333333 : 5.65300334698359 : JumpEnd); (14.3413450659698 : 5.65300334698359); (14.3413450659698 : 4.25050343910853)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(5.125 : 10.4045566171053); (5.625 : 10.4045566171053); (5.625 : 5.65300334698359); (6.2908481838422 : 5.65300334698359 : JumpStart); (6.47019662034815 : 5.65300334698359 : JumpEnd); (7.83531996348196 : 5.65300334698359 : JumpStart); (8.00198663014862 : 5.65300334698359 : JumpEnd); (9.29166666666667 : 5.65300334698359 : JumpStart); (9.45833333333333 : 5.65300334698359 : JumpEnd); (10.768877517138 : 5.65300334698359 : JumpStart); (10.9355441838046 : 5.65300334698359 : JumpEnd); (12.9166666666667 : 5.65300334698359 : JumpStart); (13.0833333333333 : 5.65300334698359 : JumpEnd); (14.3413450659698 : 5.65300334698359); (14.3413450659698 : 4.25050343910853)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="c7e82475-0fc0-4762-a108-ea6d4b69404c" />
       <relativeChildShapes />
       <nodes>
@@ -631,7 +631,7 @@
         <interfaceShapeMoniker Id="1171b11a-47db-4904-9f08-9f5f74aa6941" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(16.6046294840784 : 6.875); (16.6057446234163 : 4.25050343910853)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(16.6046294840784 : 6.875); (16.6057446234163 : 4.25050343910853)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="8c051524-0d3d-44fd-aff6-33253dd7e90a" />
       <relativeChildShapes />
       <nodes>
@@ -639,7 +639,7 @@
         <interfaceShapeMoniker Id="a10d63a4-cffa-4c71-a890-fcff49bc7d9f" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(27.0696080476501 : 0.875); (27.0696080476501 : 0.5); (19.3256248248875 : 0.5); (19.3256248248875 : 2.07554649347543); (18 : 2.07554649347543)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(27.0696080476501 : 0.875); (27.0696080476501 : 0.5); (19.3256248248875 : 0.5); (19.3256248248875 : 2.07554649347543); (18 : 2.07554649347543)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="1b7cf01f-2f13-4130-8a87-61fadf931e4b" />
       <relativeChildShapes />
       <nodes>
@@ -647,7 +647,7 @@
         <interfaceShapeMoniker Id="5fb4b1e3-2027-4e6e-be49-921b54e2b352" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(9.375 : 6.125); (9.375 : 1.77798910290193); (10.7688775171379 : 1.77798910290193 : JumpStart); (10.9355441838046 : 1.77798910290193 : JumpEnd); (13.3416666666667 : 1.77798910290193 : JumpStart); (13.5083333333333 : 1.77798910290193 : JumpEnd); (13.75 : 1.77798910290193)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="Caller" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(9.375 : 6.125); (9.375 : 1.77798910290193); (10.768877517138 : 1.77798910290193 : JumpStart); (10.9355441838046 : 1.77798910290193 : JumpEnd); (13.3416666666667 : 1.77798910290193 : JumpStart); (13.5083333333333 : 1.77798910290193 : JumpEnd); (13.75 : 1.77798910290193)]" manuallyRouted="true" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110">
       <generalizationMoniker Id="cff3c187-978f-4c9c-b998-5eb0efd790fa" />
       <relativeChildShapes />
       <nodes>
@@ -655,7 +655,7 @@
         <interfaceShapeMoniker Id="eb1a7045-c601-4045-b3c9-8b5ae6c737e3" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(16.5 : 2.11548608710368); (16 : 2.11548608710368)]" manuallyRouted="true" fixedFrom="Algorithm" fixedTo="Algorithm" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(16.5 : 2.11548608710368); (16 : 2.11548608710368)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="3af3dcf1-5a9d-4416-a19e-426b62073f17" />
       <relativeChildShapes />
       <nodes>
@@ -663,7 +663,7 @@
         <interfaceShapeMoniker Id="eb1a7045-c601-4045-b3c9-8b5ae6c737e3" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(16.5 : 2.43845686747661); (16.308 : 2.43845686747661); (16.308 : 2.808); (14.625 : 2.808); (14.625 : 3)]" fixedFrom="Caller" fixedTo="NotFixed" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(16.5 : 2.43845686747661); (16.308 : 2.43845686747661); (16.308 : 2.808); (14.625 : 2.808); (14.625 : 3)]" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="fd0e1928-0bc7-4154-a294-cdea0a82b696" />
       <relativeChildShapes />
       <nodes>
@@ -671,7 +671,7 @@
         <interfaceShapeMoniker Id="1171b11a-47db-4904-9f08-9f5f74aa6941" />
       </nodes>
     </generalizationConnector>
-    <generalizationConnector edgePoints="[(17.2086045234078 : 2.71534719407558); (17.2176342522489 : 3)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" customColor="113, 111, 110">
+    <generalizationConnector edgePoints="[(17.2086045234078 : 2.71534719407558); (17.2176342522489 : 3)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed" customColor="113, 111, 110">
       <generalizationMoniker Id="e91134b3-31b1-4833-89c6-a2f8e606bb3b" />
       <relativeChildShapes />
       <nodes>