diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-1647-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1647-expected-submodels.json
index 5528d8a886..e0c2790f80 100644
--- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-1647-expected-submodels.json
+++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-1647-expected-submodels.json
@@ -1,109 +1,109 @@
 {
-    "submodels": [
-        {
-            "identification": "urn:uuid:662f3a1b-de56-4cbb-8fb4-51779643126d",
-            "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
-            "contractAgreementId": null,
-            "payload": {
-                "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-                "subcomponents": [
-                    {
-                        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-                        "productType": "pack"
-                    }
-                ],
-                "productType": "pack"
-            }
-        },
-        {
-            "identification": "urn:uuid:73068d1b-e846-4a22-a0ae-b6310f5b0a36",
-            "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
-            "contractAgreementId": null,
-            "payload": {
-                "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-                "subcomponents": [
-                    {
-                        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-                        "productType": "module"
-                    }
-                ],
-                "productType": "module"
-            }
-        },
-        {
-            "identification": "urn:uuid:b5933d6b-f005-4a9a-996e-a55501b2d651",
-            "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
-            "contractAgreementId": null,
-            "payload": {
-                "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-                "subcomponents": [
-                    {
-                        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-                        "productType": "module"
-                    }
-                ],
-                "productType": "module"
-            }
-        },
-        {
-            "identification": "urn:uuid:ab703fb6-7869-439b-aedf-43c3f21f8060",
-            "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
-            "contractAgreementId": null,
-            "payload": {
-                "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-                "subcomponents": [
-                    {
-                        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-                        "productType": "module"
-                    }
-                ],
-                "productType": "module"
-            }
-        },
-        {
-            "identification": "urn:uuid:26aa986b-a443-4b8d-aec5-bc0da9757cbe",
-            "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
-            "contractAgreementId": null,
-            "payload": {
-                "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-                "subcomponents": [
-                    {
-                        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-                        "productType": "module"
-                    }
-                ],
-                "productType": "module"
-            }
-        },
-        {
-            "identification": "urn:uuid:1753b174-8212-429d-9f37-cfa2e0d6a07c",
-            "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
-            "contractAgreementId": null,
-            "payload": {
-                "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-                "subcomponents": [
-                    {
-                        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-                        "productType": "module"
-                    }
-                ],
-                "productType": "module"
-            }
-        },
-        {
-            "identification": "urn:uuid:6e6f7237-982e-4359-accf-e3b9c0fb4f0e",
-            "aspectType": "urn:bamm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
-            "contractAgreementId": null,
-            "payload": {
-                "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-                "subcomponents": [
-                    {
-                        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
-                        "productType": "module"
-                    }
-                ],
-                "productType": "module"
-            }
-        }
-    ]
+  "submodels": [
+    {
+      "identification": "urn:uuid:0f28e9b8-d683-4ac7-ab04-e2da39f6dbf4",
+      "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
+      "contractAgreementId": "NGFkNjljZjctNzRhYy00MzYzLWJkNGUtZjBjYjc5MTFhNDY2:dXJuOnV1aWQ6MTU5MGU0ZDgtNjRiOS00NDUyLThjZGYtZjgyMjFmNGNlNzEz:ZWQwYjA1Y2EtZTdhMS00OWNjLTgwNzgtYWYxYWU2MWMwYjU4",
+      "payload": {
+        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+        "subcomponents": [
+          {
+            "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+            "productType": "pack"
+          }
+        ],
+        "productType": "pack"
+      }
+    },
+    {
+      "identification": "urn:uuid:207317f6-5689-4957-a8b1-be613cf6e811",
+      "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
+      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
+      "payload": {
+        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+        "subcomponents": [
+          {
+            "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+            "productType": "module"
+          }
+        ],
+        "productType": "module"
+      }
+    },
+    {
+      "identification": "urn:uuid:bbbb4f96-4ffc-4228-bb8b-6c584c714c13",
+      "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
+      "contractAgreementId": "NTA2OTRiZTktNzZmNS00N2Q4LWI3ZTctNDQ2YjYyNzZkZWE2:dXJuOnV1aWQ6MTkzODIwYTktYTU4NC00NzcxLTlhYjctYmM0ZmY4Mjg2Zjlh:N2I3YWEwYTktYzYyNS00ZjdmLWEzMjMtYmYxYTkxNThlMWUw",
+      "payload": {
+        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+        "subcomponents": [
+          {
+            "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+            "productType": "module"
+          }
+        ],
+        "productType": "module"
+      }
+    },
+    {
+      "identification": "urn:uuid:6e432adb-10f0-499f-ad08-bbf36c74f9bb",
+      "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
+      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
+      "payload": {
+        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+        "subcomponents": [
+          {
+            "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+            "productType": "module"
+          }
+        ],
+        "productType": "module"
+      }
+    },
+    {
+      "identification": "urn:uuid:3685db54-9d52-4df2-87a2-05c32edbdc49",
+      "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
+      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
+      "payload": {
+        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+        "subcomponents": [
+          {
+            "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+            "productType": "module"
+          }
+        ],
+        "productType": "module"
+      }
+    },
+    {
+      "identification": "urn:uuid:86fee0d5-130c-43cc-b476-4fcce3f9a1c5",
+      "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
+      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
+      "payload": {
+        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+        "subcomponents": [
+          {
+            "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+            "productType": "module"
+          }
+        ],
+        "productType": "module"
+      }
+    },
+    {
+      "identification": "urn:uuid:5156fe68-a54b-45e6-8c82-0c4fd488be8c",
+      "aspectType": "urn:samm:io.catenax.traction_battery_code:1.0.0#TractionBatteryCode",
+      "contractAgreementId": "NGFkNjljZjctNzRhYy00MzYzLWJkNGUtZjBjYjc5MTFhNDY2:dXJuOnV1aWQ6MTU5MGU0ZDgtNjRiOS00NDUyLThjZGYtZjgyMjFmNGNlNzEz:ZWQwYjA1Y2EtZTdhMS00OWNjLTgwNzgtYWYxYWU2MWMwYjU4",
+      "payload": {
+        "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+        "subcomponents": [
+          {
+            "tractionBatteryCode": "X12MCPM27KLPCLX2M2382320",
+            "productType": "module"
+          }
+        ],
+        "productType": "module"
+      }
+    }
+  ]
 }
\ No newline at end of file
diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-relationships.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-relationships.json
index 7786f58268..bca88302a2 100644
--- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-relationships.json
+++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-relationships.json
@@ -1,61 +1,61 @@
 {
-    "relationships" : [
-        {
-            "catenaXId": "urn:uuid:e95f3ff2-c5e7-49a5-873b-aee2728917d3",
-            "linkedItem": {
-                "quantity": {
-                    "quantityNumber": 2.5,
-                    "measurementUnit": {
-                        "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
-                    }
-                },
-                "lifecycleContext": "asBuilt",
-                "assembledOn": "2022-02-03T14:48:54.709Z",
-                "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-                "childCatenaXId": "urn:uuid:d57a0374-45bc-4d9e-b44c-e6e75cfe84c0",
-                "hasAlternatives": true
-            },
-            "aspectType": "SingleLevelBomAsBuilt",
-            "bpn": "BPNL00000003B3NX"
+  "relationships": [
+    {
+      "catenaXId": "urn:uuid:015aa300-f0ea-47cd-84d5-969f2cb2cf75",
+      "linkedItem": {
+        "quantity": {
+          "quantityNumber": 20.0,
+          "measurementUnit": {
+            "datatypeURI": null,
+            "lexicalValue": "unit:piece"
+          }
         },
-        {
-            "catenaXId": "urn:uuid:e95f3ff2-c5e7-49a5-873b-aee2728917d3",
-            "linkedItem": {
-                "quantity": {
-                    "quantityNumber": 0.2341,
-                    "measurementUnit": {
-                        "datatypeURI": null,
-                        "lexicalValue": "unit:kilogram"
-                    }
-                },
-                "lifecycleContext": "asBuilt",
-                "assembledOn": "2022-02-03T14:48:54.709Z",
-                "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-                "childCatenaXId": "urn:uuid:098d565e-915a-4794-a60a-d92a8391bdde",
-                "hasAlternatives": true
-            },
-            "aspectType": "SingleLevelBomAsBuilt",
-            "bpn": "BPNL00000003AZQP"
+        "lifecycleContext": "asBuilt",
+        "assembledOn": "2022-02-03T14:48:54.709Z",
+        "lastModifiedOn": "2022-02-03T14:48:54.709Z",
+        "childCatenaXId": "urn:uuid:91ec20ec-67ab-4699-9ae9-029ed5e332dc",
+        "hasAlternatives": false
+      },
+      "aspectType": "SingleLevelBomAsBuilt",
+      "bpn": "BPNL00000003B3NX"
+    },
+    {
+      "catenaXId": "urn:uuid:015aa300-f0ea-47cd-84d5-969f2cb2cf75",
+      "linkedItem": {
+        "quantity": {
+          "quantityNumber": 0.2341,
+          "measurementUnit": {
+            "datatypeURI": null,
+            "lexicalValue": "unit:kilogram"
+          }
         },
-        {
-            "catenaXId": "urn:uuid:e95f3ff2-c5e7-49a5-873b-aee2728917d3",
-            "linkedItem": {
-                "quantity": {
-                    "quantityNumber": 0.2014,
-                    "measurementUnit": {
-                        "datatypeURI": null,
-                        "lexicalValue": "unit:kilogram"
-                    }
-                },
-                "lifecycleContext": "asBuilt",
-                "assembledOn": "2022-02-03T14:48:54.709Z",
-                "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-                "childCatenaXId": "urn:uuid:aa42c959-a79c-4350-8ff8-3126a9e984a0",
-                "hasAlternatives": true
-            },
-            "aspectType": "SingleLevelBomAsBuilt",
-            "bpn": "BPNL00000003AYRE"
-        }
-    ]
+        "lifecycleContext": "asBuilt",
+        "assembledOn": "2022-02-03T14:48:54.709Z",
+        "lastModifiedOn": "2022-02-03T14:48:54.709Z",
+        "childCatenaXId": "urn:uuid:94ae80dd-e5e2-45cc-893c-9fa63622e47f",
+        "hasAlternatives": false
+      },
+      "aspectType": "SingleLevelBomAsBuilt",
+      "bpn": "BPNL00000003AZQP"
+    },
+    {
+      "catenaXId": "urn:uuid:015aa300-f0ea-47cd-84d5-969f2cb2cf75",
+      "linkedItem": {
+        "quantity": {
+          "quantityNumber": 0.2014,
+          "measurementUnit": {
+            "datatypeURI": null,
+            "lexicalValue": "unit:kilogram"
+          }
+        },
+        "lifecycleContext": "asBuilt",
+        "assembledOn": "2022-02-03T14:48:54.709Z",
+        "lastModifiedOn": "2022-02-03T14:48:54.709Z",
+        "childCatenaXId": "urn:uuid:d5fbfc88-d838-4f9b-b9ba-2d5e81beab94",
+        "hasAlternatives": false
+      },
+      "aspectType": "SingleLevelBomAsBuilt",
+      "bpn": "BPNL00000003AYRE"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-submodels.json
index 75fe752934..bd63449577 100644
--- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-submodels.json
+++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-528-expected-submodels.json
@@ -1,46 +1,46 @@
 {
-    "submodels" : [
-        {
-            "identification": "urn:uuid:5fbf0548-8119-4550-852e-3c58eac4a36c",
-            "aspectType": "urn:bamm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
-            "contractAgreementId": null,
-            "payload": {
-                "component": [
-                    {
-                        "materialName": "Carbon Steel",
-                        "recycledContent": 35,
-                        "materialClass": "1.1.2",
-                        "quantity": {
-                            "unit": "unit:kilogram",
-                            "value": 72.843
-                        },
-                        "aggregateState": "solid",
-                        "materialAbbreviation": "CS2"
-                    },
-                    {
-                        "materialName": "Oil",
-                        "recycledContent": 4,
-                        "materialClass": "9.2",
-                        "quantity": {
-                            "unit": "unit:kilogram",
-                            "value": 6.9
-                        },
-                        "aggregateState": "liquid",
-                        "materialAbbreviation": "SAE40"
-                    },
-                    {
-                        "materialName": "Copper",
-                        "recycledContent": 10,
-                        "materialClass": "3.1",
-                        "quantity": {
-                            "unit": "unit:kilogram",
-                            "value": 1.2
-                        },
-                        "aggregateState": "solid",
-                        "materialAbbreviation": "CO7"
-                    }
-                ]
-            }
-        }
-    ]
+  "submodels": [
+    {
+      "identification": "urn:uuid:46c4b216-bedd-4161-a141-f6c218784ddf",
+      "aspectType": "urn:samm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
+      "contractAgreementId": "NTA2OTRiZTktNzZmNS00N2Q4LWI3ZTctNDQ2YjYyNzZkZWE2:dXJuOnV1aWQ6MTkzODIwYTktYTU4NC00NzcxLTlhYjctYmM0ZmY4Mjg2Zjlh:N2I3YWEwYTktYzYyNS00ZjdmLWEzMjMtYmYxYTkxNThlMWUw",
+      "payload": {
+        "component": [
+          {
+            "materialName": "Carbon Steel",
+            "recycledContent": 37,
+            "materialClass": "1.1.2",
+            "quantity": {
+              "unit": "unit:kilogram",
+              "value": 72.843
+            },
+            "aggregateState": "solid",
+            "materialAbbreviation": "CS2"
+          },
+          {
+            "materialName": "Oil",
+            "recycledContent": 32,
+            "materialClass": "9.2",
+            "quantity": {
+              "unit": "unit:kilogram",
+              "value": 6.9
+            },
+            "aggregateState": "liquid",
+            "materialAbbreviation": "SAE40"
+          },
+          {
+            "materialName": "Copper",
+            "recycledContent": 76,
+            "materialClass": "3.1",
+            "quantity": {
+              "unit": "unit:kilogram",
+              "value": 1.2
+            },
+            "aggregateState": "solid",
+            "materialAbbreviation": "CO7"
+          }
+        ]
+      }
+    }
+  ]
 }
\ No newline at end of file
diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-relationships.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-relationships.json
index aeceb370e2..8d6c017740 100644
--- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-relationships.json
+++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-relationships.json
@@ -1,71 +1,80 @@
 {
-    "relationships" : [ {
-        "catenaXId" : "urn:uuid:334cce52-1f52-4bc9-9dd1-410bbe497bbc",
-        "linkedItem" : {
-            "quantity" : {
-                "quantityNumber" : 2.5,
-                "measurementUnit" : {
-                    "datatypeURI" : null,
-                    "lexicalValue" : "unit:litre"
-                }
+    "relationships": [
+        {
+            "catenaXId": "urn:uuid:e097c30e-9010-4eb9-8a8c-064736aceab8",
+            "linkedItem": {
+                "quantity": {
+                    "quantityNumber": 20.0,
+                    "measurementUnit": {
+                        "datatypeURI": null,
+                        "lexicalValue": "unit:piece"
+                    }
+                },
+                "lifecycleContext": "asBuilt",
+                "assembledOn": "2022-02-03T14:48:54.709Z",
+                "lastModifiedOn": "2022-02-03T14:48:54.709Z",
+                "childCatenaXId": "urn:uuid:622f4933-e02b-436c-9194-9e5bb71a45e2",
+                "hasAlternatives": false
             },
-            "lifecycleContext" : "asBuilt",
-            "assembledOn" : "2022-02-03T14:48:54.709Z",
-            "lastModifiedOn" : "2022-02-03T14:48:54.709Z",
-            "childCatenaXId" : "urn:uuid:e47f0639-8e20-4ae5-bd4a-6a07e2f106d9"
+            "aspectType": "SingleLevelBomAsBuilt",
+            "bpn": "BPNL00000003B3NX"
         },
-        "aspectType" : "SingleLevelBomAsBuilt",
-        "bpn" : "BPNL00000003B3NX"
-    }, {
-        "catenaXId" : "urn:uuid:334cce52-1f52-4bc9-9dd1-410bbe497bbc",
-        "linkedItem" : {
-            "quantity" : {
-                "quantityNumber" : 0.2014,
-                "measurementUnit" : {
-                    "datatypeURI" : null,
-                    "lexicalValue" : "unit:kilogram"
-                }
+        {
+            "catenaXId": "urn:uuid:e097c30e-9010-4eb9-8a8c-064736aceab8",
+            "linkedItem": {
+                "quantity": {
+                    "quantityNumber": 0.2341,
+                    "measurementUnit": {
+                        "datatypeURI": null,
+                        "lexicalValue": "unit:kilogram"
+                    }
+                },
+                "lifecycleContext": "asBuilt",
+                "assembledOn": "2022-02-03T14:48:54.709Z",
+                "lastModifiedOn": "2022-02-03T14:48:54.709Z",
+                "childCatenaXId": "urn:uuid:ee9b9c9e-1416-45a3-b683-d98d5d88e548",
+                "hasAlternatives": false
             },
-            "lifecycleContext" : "asBuilt",
-            "assembledOn" : "2022-02-03T14:48:54.709Z",
-            "lastModifiedOn" : "2022-02-03T14:48:54.709Z",
-            "childCatenaXId" : "urn:uuid:7e4541ea-bb0f-464c-8cb3-021abccbfaf5"
+            "aspectType": "SingleLevelBomAsBuilt",
+            "bpn": "BPNL00000003AZQP"
         },
-        "aspectType" : "SingleLevelBomAsBuilt",
-        "bpn" : "BPNL00000003AYRE"
-    }, {
-        "catenaXId" : "urn:uuid:334cce52-1f52-4bc9-9dd1-410bbe497bbc",
-        "linkedItem" : {
-            "quantity" : {
-                "quantityNumber" : 0.2341,
-                "measurementUnit" : {
-                    "datatypeURI" : null,
-                    "lexicalValue" : "unit:kilogram"
-                }
+        {
+            "catenaXId": "urn:uuid:e097c30e-9010-4eb9-8a8c-064736aceab8",
+            "linkedItem": {
+                "quantity": {
+                    "quantityNumber": 0.2014,
+                    "measurementUnit": {
+                        "datatypeURI": null,
+                        "lexicalValue": "unit:kilogram"
+                    }
+                },
+                "lifecycleContext": "asBuilt",
+                "assembledOn": "2022-02-03T14:48:54.709Z",
+                "lastModifiedOn": "2022-02-03T14:48:54.709Z",
+                "childCatenaXId": "urn:uuid:0218c3f2-2f70-457c-acc8-b70f1ee53d43",
+                "hasAlternatives": false
             },
-            "lifecycleContext" : "asBuilt",
-            "assembledOn" : "2022-02-03T14:48:54.709Z",
-            "lastModifiedOn" : "2022-02-03T14:48:54.709Z",
-            "childCatenaXId" : "urn:uuid:e0390640-5d3f-4e30-bfb8-05e7e802fcb0"
+            "aspectType": "SingleLevelBomAsBuilt",
+            "bpn": "BPNL00000003AYRE"
         },
-        "aspectType" : "SingleLevelBomAsBuilt",
-        "bpn" : "BPNL00000003AZQP"
-    }, {
-        "catenaXId" : "urn:uuid:e47f0639-8e20-4ae5-bd4a-6a07e2f106d9",
-        "linkedItem" : {
-            "quantity" : {
-                "quantityNumber" : 0.1908,
-                "measurementUnit" : {
-                    "datatypeURI" : null,
-                    "lexicalValue" : "unit:kilogram"
-                }
+        {
+            "catenaXId": "urn:uuid:622f4933-e02b-436c-9194-9e5bb71a45e2",
+            "linkedItem": {
+                "quantity": {
+                    "quantityNumber": 0.1908,
+                    "measurementUnit": {
+                        "datatypeURI": null,
+                        "lexicalValue": "unit:kilogram"
+                    }
+                },
+                "lifecycleContext": "asBuilt",
+                "assembledOn": "2022-02-03T14:48:54.709Z",
+                "lastModifiedOn": "2022-02-03T14:48:54.709Z",
+                "childCatenaXId": "urn:uuid:76ad44b1-89bc-47e3-ad84-b668a7899515",
+                "hasAlternatives": false
             },
-            "lifecycleContext" : "asBuilt",
-            "assembledOn" : "2022-02-03T14:48:54.709Z",
-            "lastModifiedOn" : "2022-02-03T14:48:54.709Z",
-            "childCatenaXId" : "urn:uuid:f3964e8b-dd90-4748-bfeb-53f523b03052"
-        },
-        "aspectType" : "SingleLevelBomAsBuilt",
-        "bpn" : "BPNL00000003B0Q0"
-    } ]
+            "aspectType": "SingleLevelBomAsBuilt",
+            "bpn": "BPNL00000003B0Q0"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-submodels.json
index 6176e13b1e..ca9afdf015 100644
--- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-submodels.json
+++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-704-expected-submodels.json
@@ -1,231 +1,412 @@
 {
-  "submodels" : [ {
-    "identification" : "fb455e3d-0f87-4476-bda3-7ab4ce5fea09",
-    "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt",
-    "payload" : {
-      "catenaXId" : "urn:uuid:334cce52-1f52-4bc9-9dd1-410bbe497bbc",
-      "childItems" : [ {
-        "catenaXId" : "urn:uuid:7e4541ea-bb0f-464c-8cb3-021abccbfaf5",
-        "quantity" : {
-          "quantityNumber" : 0.2014,
-          "measurementUnit" : "unit:kilogram"
+  "submodels": [
+    {
+      "identification": "urn:uuid:1f2fd0ac-c7e1-4cb7-984d-48ea0ee4af3d",
+      "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart",
+      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
+      "payload": {
+        "localIdentifiers": [
+          {
+            "value": "BPNL00000003B2OM",
+            "key": "manufacturerId"
+          },
+          {
+            "value": "42555H1-52",
+            "key": "manufacturerPartId"
+          },
+          {
+            "value": "NO-392235679424701475513847",
+            "key": "partInstanceId"
+          },
+          {
+            "value": "Company 2",
+            "key": "company"
+          },
+          {
+            "value": "Brand 2",
+            "key": "brand"
+          }
+        ],
+        "manufacturingInformation": {
+          "date": "2022-02-04T14:48:54",
+          "country": "DEU",
+          "sites": [
+            {
+              "catenaXsiteId": "BPNS00000003B2OM",
+              "function": "production"
+            }
+          ]
         },
-        "hasAlternatives" : true,
-        "businessPartner" : "BPNL00000003AYRE",
-        "createdOn" : "2022-02-03T14:48:54.709Z",
-        "lastModifiedOn" : "2022-02-03T14:48:54.709Z"
-      }, {
-        "catenaXId" : "urn:uuid:e47f0639-8e20-4ae5-bd4a-6a07e2f106d9",
-        "quantity" : {
-          "quantityNumber" : 2.5,
-          "measurementUnit" : "unit:litre"
+        "catenaXId": "urn:uuid:e097c30e-9010-4eb9-8a8c-064736aceab8",
+        "partTypeInformation": {
+          "manufacturerPartId": "42555H1-52",
+          "customerPartId": "42555H1-52",
+          "partClassification": [
+            {
+              "classificationDescription": "Standard data element types with associated classification scheme for electric components.",
+              "classificationStandard": "IEC",
+              "classificationID": "61360- 2:2012 "
+            }
+          ],
+          "nameAtManufacturer": "Transmission",
+          "nameAtCustomer": "Transmission"
         },
-        "hasAlternatives" : true,
-        "businessPartner" : "BPNL00000003B3NX",
-        "createdOn" : "2022-02-03T14:48:54.709Z",
-        "lastModifiedOn" : "2022-02-03T14:48:54.709Z"
-      }, {
-        "catenaXId" : "urn:uuid:e0390640-5d3f-4e30-bfb8-05e7e802fcb0",
-        "quantity" : {
-          "quantityNumber" : 0.2341,
-          "measurementUnit" : "unit:kilogram"
-        },
-        "hasAlternatives" : true,
-        "businessPartner" : "BPNL00000003AZQP",
-        "createdOn" : "2022-02-03T14:48:54.709Z",
-        "lastModifiedOn" : "2022-02-03T14:48:54.709Z"
-      } ]
-    }
-  }, {
-    "identification" : "c63836f1-3fdf-403e-a9b6-5ddbf8c55c9b",
-    "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart",
-    "payload" : {
-      "localIdentifiers" : [ {
-        "value" : "BPNL00000003B2OM",
-        "key" : "manufacturerId"
-      }, {
-        "value" : "1O222E8-43",
-        "key" : "manufacturerPartId"
-      }, {
-        "value" : "NO-223043329736843650243373",
-        "key" : "partInstanceId"
-      }, {
-        "value" : "Company 2",
-        "key" : "company"
-      }, {
-        "value" : "Brand 2",
-        "key" : "brand"
-      } ],
-      "manufacturingInformation" : {
-        "date" : "2022-02-04T14:48:54",
-        "country" : "DEU"
-      },
-      "catenaXId" : "urn:uuid:334cce52-1f52-4bc9-9dd1-410bbe497bbc",
-      "partTypeInformation" : {
-        "manufacturerPartId" : "1O222E8-43",
-        "customerPartId" : "1O222E8-43",
-        "classification" : "component",
-        "nameAtManufacturer" : "Transmission",
-        "nameAtCustomer" : "Transmission"
+        "itemVersion": "04"
       }
-    }
-  }, {
-    "identification" : "8043a4a4-1e8d-4c1e-b7e5-1c563afab80e",
-    "aspectType" : "urn:bamm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
-    "payload" : {
-      "component" : [ {
-        "materialName" : "Carbon Steel",
-        "recycledContent" : 33,
-        "materialClass" : "1.1.2",
-        "quantity" : {
-          "unit" : "unit:kilogram",
-          "value" : 72.843
+    },
+    {
+      "identification": "urn:uuid:4388f542-6f2b-4188-a6fc-f40e63ecf32c",
+      "aspectType": "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt",
+      "contractAgreementId": "NTA2OTRiZTktNzZmNS00N2Q4LWI3ZTctNDQ2YjYyNzZkZWE2:dXJuOnV1aWQ6MTkzODIwYTktYTU4NC00NzcxLTlhYjctYmM0ZmY4Mjg2Zjlh:N2I3YWEwYTktYzYyNS00ZjdmLWEzMjMtYmYxYTkxNThlMWUw",
+      "payload": {
+        "catenaXId": "urn:uuid:e097c30e-9010-4eb9-8a8c-064736aceab8",
+        "childItems": [
+          {
+            "catenaXId": "urn:uuid:0218c3f2-2f70-457c-acc8-b70f1ee53d43",
+            "quantity": {
+              "unit": "unit:kilogram",
+              "value": 0.2014
+            },
+            "hasAlternatives": false,
+            "businessPartner": "BPNL00000003AYRE",
+            "createdOn": "2022-02-03T14:48:54.709Z",
+            "lastModifiedOn": "2022-02-03T14:48:54.709Z"
+          },
+          {
+            "catenaXId": "urn:uuid:622f4933-e02b-436c-9194-9e5bb71a45e2",
+            "quantity": {
+              "unit": "unit:piece",
+              "value": 20
+            },
+            "hasAlternatives": false,
+            "businessPartner": "BPNL00000003B3NX",
+            "createdOn": "2022-02-03T14:48:54.709Z",
+            "lastModifiedOn": "2022-02-03T14:48:54.709Z"
+          },
+          {
+            "catenaXId": "urn:uuid:ee9b9c9e-1416-45a3-b683-d98d5d88e548",
+            "quantity": {
+              "unit": "unit:kilogram",
+              "value": 0.2341
+            },
+            "hasAlternatives": false,
+            "businessPartner": "BPNL00000003AZQP",
+            "createdOn": "2022-02-03T14:48:54.709Z",
+            "lastModifiedOn": "2022-02-03T14:48:54.709Z"
+          }
+        ]
+      }
+    },
+    {
+      "identification": "urn:uuid:7dd20ad1-552c-4d39-bb1c-abb7404b212c",
+      "aspectType": "urn:samm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
+      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
+      "payload": {
+        "component": [
+          {
+            "materialName": "Carbon Steel",
+            "recycledContent": 50,
+            "materialClass": "1.1.2",
+            "quantity": {
+              "unit": "unit:kilogram",
+              "value": 72.843
+            },
+            "aggregateState": "solid",
+            "materialAbbreviation": "CS2"
+          },
+          {
+            "materialName": "Oil",
+            "recycledContent": 12,
+            "materialClass": "9.2",
+            "quantity": {
+              "unit": "unit:kilogram",
+              "value": 6.9
+            },
+            "aggregateState": "liquid",
+            "materialAbbreviation": "SAE40"
+          },
+          {
+            "materialName": "Copper",
+            "recycledContent": 89,
+            "materialClass": "3.1",
+            "quantity": {
+              "unit": "unit:kilogram",
+              "value": 1.2
+            },
+            "aggregateState": "solid",
+            "materialAbbreviation": "CO7"
+          }
+        ]
+      }
+    },
+    {
+      "identification": "urn:uuid:1a4df609-8e2f-488c-a7e3-f00e548c0d78",
+      "aspectType": "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt",
+      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
+      "payload": {
+        "catenaXId": "urn:uuid:ee9b9c9e-1416-45a3-b683-d98d5d88e548",
+        "childItems": []
+      }
+    },
+    {
+      "identification": "urn:uuid:1b721676-f106-4074-905c-f2c21029145a",
+      "aspectType": "urn:samm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
+      "contractAgreementId": "NTA2OTRiZTktNzZmNS00N2Q4LWI3ZTctNDQ2YjYyNzZkZWE2:dXJuOnV1aWQ6MTkzODIwYTktYTU4NC00NzcxLTlhYjctYmM0ZmY4Mjg2Zjlh:N2I3YWEwYTktYzYyNS00ZjdmLWEzMjMtYmYxYTkxNThlMWUw",
+      "payload": {
+        "component": [
+          {
+            "materialName": "Glue",
+            "materialClass": "6.2",
+            "quantity": {
+              "unit": "unit:kilogram",
+              "value": 2.5
+            },
+            "weight": "0.2341",
+            "materialAbbreviation": "GL338"
+          }
+        ]
+      }
+    },
+    {
+      "identification": "urn:uuid:6f920ae9-80a6-4b6d-a4c0-6ae876798588",
+      "aspectType": "urn:samm:io.catenax.batch:3.0.0#Batch",
+      "contractAgreementId": "NTA2OTRiZTktNzZmNS00N2Q4LWI3ZTctNDQ2YjYyNzZkZWE2:dXJuOnV1aWQ6MTkzODIwYTktYTU4NC00NzcxLTlhYjctYmM0ZmY4Mjg2Zjlh:N2I3YWEwYTktYzYyNS00ZjdmLWEzMjMtYmYxYTkxNThlMWUw",
+      "payload": {
+        "localIdentifiers": [
+          {
+            "value": "BPNL00000003AXS3",
+            "key": "batchId"
+          }
+        ],
+        "manufacturingInformation": {
+          "date": "2022-02-04T14:48:54",
+          "country": "HUR",
+          "sites": [
+            {
+              "catenaXsiteId": "BPNS00000003AXS3",
+              "function": "production"
+            }
+          ]
         },
-        "aggregateState" : "solid",
-        "materialAbbreviation" : "CS2"
-      }, {
-        "materialName" : "Oil",
-        "recycledContent" : 4,
-        "materialClass" : "9.2",
-        "quantity" : {
-          "unit" : "unit:kilogram",
-          "value" : 6.9
+        "catenaXId": "urn:uuid:ee9b9c9e-1416-45a3-b683-d98d5d88e548",
+        "partTypeInformation": {
+          "manufacturerPartId": "SC-00",
+          "partClassification": [
+            {
+              "classificationDescription": "Standard data element types with associated classification scheme for electric components.",
+              "classificationStandard": "IEC",
+              "classificationID": "61360- 2:2012 "
+            }
+          ],
+          "nameAtManufacturer": "Mirror left"
         },
-        "aggregateState" : "liquid",
-        "materialAbbreviation" : "SAE40"
-      }, {
-        "materialName" : "Copper",
-        "recycledContent" : 37,
-        "materialClass" : "3.1",
-        "quantity" : {
-          "unit" : "unit:kilogram",
-          "value" : 1.2
+        "itemVersion": "03"
+      }
+    },
+    {
+      "identification": "urn:uuid:b768de63-a985-4baf-a6d6-e26c4b2cf66c",
+      "aspectType": "urn:samm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
+      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
+      "payload": {
+        "materialName": "Engineering Plastics",
+        "materialClass": "5.1",
+        "component": [
+          {
+            "materialName": "PA66",
+            "recycledContent": 31,
+            "materialClass": "5.1",
+            "quantity": {
+              "unit": "unit:percent",
+              "value": 70
+            },
+            "aggregateState": "solid",
+            "materialAbbreviation": "PA66"
+          },
+          {
+            "materialName": "GF-Faser",
+            "recycledContent": 74,
+            "materialClass": "5.1",
+            "quantity": {
+              "unit": "unit:percent",
+              "value": 30
+            },
+            "aggregateState": "solid",
+            "materialAbbreviation": "GF30"
+          }
+        ]
+      }
+    },
+    {
+      "identification": "urn:uuid:1b013dbd-c709-43dc-8d44-eeb12c3caefa",
+      "aspectType": "urn:samm:io.catenax.batch:3.0.0#Batch",
+      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
+      "payload": {
+        "localIdentifiers": [
+          {
+            "value": "BPNL00000003B0Q0",
+            "key": "batchId"
+          }
+        ],
+        "manufacturingInformation": {
+          "date": "2022-02-04T14:48:54",
+          "country": "HUR",
+          "sites": [
+            {
+              "catenaXsiteId": "BPNS00000003B0Q0",
+              "function": "production"
+            }
+          ]
         },
-        "aggregateState" : "solid",
-        "materialAbbreviation" : "CO7"
-      } ]
-    }
-  },  {
-    "identification" : "1e3766ab-79a0-4592-a708-c5579ca8ac04",
-    "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt",
-    "payload" : {
-      "catenaXId" : "urn:uuid:e47f0639-8e20-4ae5-bd4a-6a07e2f106d9",
-      "childItems" : [ {
-        "catenaXId" : "urn:uuid:f3964e8b-dd90-4748-bfeb-53f523b03052",
-        "quantity" : {
-          "quantityNumber" : 0.1908,
-          "measurementUnit" : "unit:kilogram"
+        "catenaXId": "urn:uuid:0218c3f2-2f70-457c-acc8-b70f1ee53d43",
+        "partTypeInformation": {
+          "manufacturerPartId": "JK-40",
+          "partClassification": [
+            {
+              "classificationDescription": "Standard data element types with associated classification scheme for electric components.",
+              "classificationStandard": "IEC",
+              "classificationID": "61360- 2:2012 "
+            }
+          ],
+          "nameAtManufacturer": "Mirror left"
         },
-        "hasAlternatives" : true,
-        "businessPartner" : "BPNL00000003B0Q0",
-        "createdOn" : "2022-02-03T14:48:54.709Z",
-        "lastModifiedOn" : "2022-02-03T14:48:54.709Z"
-      } ]
-    }
-  }, {
-    "identification" : "bd7012a5-8e96-4372-838e-263cf117d260",
-    "aspectType" : "urn:bamm:io.catenax.serial_part:1.0.1#SerialPart",
-    "payload" : {
-      "localIdentifiers" : [ {
-        "value" : "BPNL00000003B3NX",
-        "key" : "manufacturerId"
-      }, {
-        "value" : "74470K4-08",
-        "key" : "manufacturerPartId"
-      }, {
-        "value" : "NO-550767244022562000296953",
-        "key" : "partInstanceId"
-      } ],
-      "manufacturingInformation" : {
-        "date" : "2022-02-04T14:48:54",
-        "country" : "DEU"
-      },
-      "catenaXId" : "urn:uuid:e47f0639-8e20-4ae5-bd4a-6a07e2f106d9",
-      "partTypeInformation" : {
-        "manufacturerPartId" : "74470K4-08",
-        "customerPartId" : "74470K4-08",
-        "classification" : "component",
-        "nameAtManufacturer" : "Sensor",
-        "nameAtCustomer" : "Sensor"
+        "itemVersion": "02"
       }
-    }
-  }, {
-    "identification" : "e2105990-e92f-4a3c-b9d3-f1ec0dc28f2b",
-    "aspectType" : "urn:bamm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
-    "payload" : {
-      "materialName" : "NTIER Product",
-      "materialClass" : "5.5",
-      "component" : [ {
-        "materialName" : "Aluminium oxide",
-        "recycledContent" : 1,
-        "materialClass" : "5.5.1",
-        "quantity" : {
-          "unit" : "unit:percent",
-          "value" : 60
+    },
+    {
+      "identification": "urn:uuid:686eb04e-c34e-4995-baae-a2a13c2fd42d",
+      "aspectType": "urn:samm:io.catenax.serial_part:3.0.0#SerialPart",
+      "contractAgreementId": "NGFkNjljZjctNzRhYy00MzYzLWJkNGUtZjBjYjc5MTFhNDY2:dXJuOnV1aWQ6MTU5MGU0ZDgtNjRiOS00NDUyLThjZGYtZjgyMjFmNGNlNzEz:ZWQwYjA1Y2EtZTdhMS00OWNjLTgwNzgtYWYxYWU2MWMwYjU4",
+      "payload": {
+        "localIdentifiers": [
+          {
+            "value": "BPNL00000003B3NX",
+            "key": "manufacturerId"
+          },
+          {
+            "value": "08708I5-06",
+            "key": "manufacturerPartId"
+          },
+          {
+            "value": "NO-072282005385522070609321",
+            "key": "partInstanceId"
+          }
+        ],
+        "manufacturingInformation": {
+          "date": "2022-02-04T14:48:54",
+          "country": "DEU",
+          "sites": [
+            {
+              "catenaXsiteId": "BPNS00000003CSGV",
+              "function": "production"
+            }
+          ]
         },
-        "aggregateState" : "solid",
-        "materialAbbreviation" : ""
-      }, {
-        "materialName" : "Other",
-        "recycledContent" : 24,
-        "materialClass" : "5.5.2",
-        "quantity" : {
-          "unit" : "unit:percent",
-          "value" : 40
+        "catenaXId": "urn:uuid:622f4933-e02b-436c-9194-9e5bb71a45e2",
+        "partTypeInformation": {
+          "manufacturerPartId": "08708I5-06",
+          "customerPartId": "08708I5-06",
+          "partClassification": [
+            {
+              "classificationDescription": "Standard data element types with associated classification scheme for electric components.",
+              "classificationStandard": "IEC",
+              "classificationID": "61360- 2:2012 "
+            }
+          ],
+          "nameAtManufacturer": "Sensor",
+          "nameAtCustomer": "Sensor"
         },
-        "aggregateState" : "solid",
-        "materialAbbreviation" : ""
-      } ]
-    }
-  }, {
-    "identification" : "d0464051-3535-4ad9-93e7-f91ecac11474",
-    "aspectType" : "urn:bamm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
-    "payload" : {
-      "materialName" : "Engineering Plastics",
-      "materialClass" : "5.1",
-      "component" : [ {
-        "materialName" : "PA66",
-        "recycledContent" : 30,
-        "materialClass" : "5.1",
-        "quantity" : {
-          "unit" : "unit:percent",
-          "value" : 70
-        },
-        "aggregateState" : "solid",
-        "materialAbbreviation" : "PA66"
-      }, {
-        "materialName" : "GF-Faser",
-        "recycledContent" : 19,
-        "materialClass" : "5.1",
-        "quantity" : {
-          "unit" : "unit:percent",
-          "value" : 30
+        "itemVersion": "05"
+      }
+    },
+    {
+      "identification": "urn:uuid:02cdc2d5-98eb-406a-951c-94b579660ec3",
+      "aspectType": "urn:samm:io.catenax.single_level_bom_as_built:3.0.0#SingleLevelBomAsBuilt",
+      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
+      "payload": {
+        "catenaXId": "urn:uuid:622f4933-e02b-436c-9194-9e5bb71a45e2",
+        "childItems": [
+          {
+            "catenaXId": "urn:uuid:76ad44b1-89bc-47e3-ad84-b668a7899515",
+            "quantity": {
+              "unit": "unit:kilogram",
+              "value": 0.1908
+            },
+            "hasAlternatives": false,
+            "businessPartner": "BPNL00000003B0Q0",
+            "createdOn": "2022-02-03T14:48:54.709Z",
+            "lastModifiedOn": "2022-02-03T14:48:54.709Z"
+          }
+        ]
+      }
+    },
+    {
+      "identification": "urn:uuid:9b89f6b2-39e3-41cd-bb5f-65f87fe7e4b2",
+      "aspectType": "urn:samm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
+      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
+      "payload": {
+        "materialName": "NTIER Product",
+        "materialClass": "5.5",
+        "component": [
+          {
+            "materialName": "Aluminium oxide",
+            "recycledContent": 41,
+            "materialClass": "5.5.1",
+            "quantity": {
+              "unit": "unit:percent",
+              "value": 60
+            },
+            "aggregateState": "solid",
+            "materialAbbreviation": ""
+          },
+          {
+            "materialName": "Other",
+            "recycledContent": 5,
+            "materialClass": "5.5.2",
+            "quantity": {
+              "unit": "unit:percent",
+              "value": 40
+            },
+            "aggregateState": "solid",
+            "materialAbbreviation": ""
+          }
+        ]
+      }
+    },
+    {
+      "identification": "urn:uuid:b553e542-a608-4c55-941a-5a246ff23161",
+      "aspectType": "urn:samm:io.catenax.batch:3.0.0#Batch",
+      "contractAgreementId": "ZTY1ZGNhY2MtZGQ1Ny00N2NjLWE0MjItMzU5OTMzZjg0ZWIz:dXJuOnV1aWQ6MDc4YTJiMTctMjJkZS00NTMwLWI2ODktYzYwNzNmZjRkMjA2:MzBkNDllMDgtNzFhNS00Y2E4LTg1OWEtYWIxODkzMGJjN2Qy",
+      "payload": {
+        "localIdentifiers": [
+          {
+            "value": "BPNL00000003B0Q0",
+            "key": "batchId"
+          }
+        ],
+        "manufacturingInformation": {
+          "date": "2022-02-04T14:48:54",
+          "country": "HUR",
+          "sites": [
+            {
+              "catenaXsiteId": "BPNS00000003B0Q0",
+              "function": "production"
+            }
+          ]
         },
-        "aggregateState" : "solid",
-        "materialAbbreviation" : "GF30"
-      } ]
-    }
-  }, {
-    "identification" : "0b881281-0c15-471d-90cf-855ea3b8585f",
-    "aspectType" : "urn:bamm:io.catenax.single_level_bom_as_built:2.0.0#SingleLevelBomAsBuilt",
-    "payload" : {
-      "catenaXId" : "urn:uuid:e0390640-5d3f-4e30-bfb8-05e7e802fcb0",
-      "childItems" : [ ]
-    }
-  }, {
-    "identification" : "544817ae-1ea2-4614-9fdb-50c448925d51",
-    "aspectType" : "urn:bamm:io.catenax.material_for_recycling:1.1.0#MaterialForRecycling",
-    "payload" : {
-      "component" : [ {
-        "materialName" : "Glue",
-        "materialClass" : "6.2",
-        "quantity" : {
-          "unit" : "unit:kilogram",
-          "value" : 2.5
+        "catenaXId": "urn:uuid:76ad44b1-89bc-47e3-ad84-b668a7899515",
+        "partTypeInformation": {
+          "manufacturerPartId": "QQ-78",
+          "partClassification": [
+            {
+              "classificationDescription": "Standard data element types with associated classification scheme for electric components.",
+              "classificationStandard": "IEC",
+              "classificationID": "61360- 2:2012 "
+            }
+          ],
+          "nameAtManufacturer": "Mirror left"
         },
-        "weight" : "0.2341",
-        "materialAbbreviation" : "GL338"
-      } ]
+        "itemVersion": "01"
+      }
     }
-  } ]
+  ]
 }
\ No newline at end of file
diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-relationships.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-relationships.json
index 35b62aff75..8660465e5c 100644
--- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-relationships.json
+++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-relationships.json
@@ -7,7 +7,7 @@
                     "quantityNumber": 1.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
+                        "lexicalValue": "unit:piece"
                     }
                 },
                 "lifecycleContext": "asPlanned",
@@ -26,7 +26,7 @@
                     "quantityNumber": 1.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
+                        "lexicalValue": "unit:piece"
                     }
                 },
                 "lifecycleContext": "asPlanned",
@@ -39,61 +39,61 @@
             "bpn": "BPNL50096894aNXY"
         },
         {
-            "catenaXId": "urn:uuid:e3e2a4d8-58bc-4ae9-afa2-e8946fda1f77",
+            "catenaXId": "urn:uuid:e8c48a8e-d2d7-43d9-a867-65c70c85f5b8",
             "linkedItem": {
                 "quantity": {
-                    "quantityNumber": 1.0,
+                    "quantityNumber": 1580.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
+                        "lexicalValue": "unit:gram"
                     }
                 },
                 "lifecycleContext": "asPlanned",
                 "assembledOn": "2022-02-03T14:48:54.709Z",
                 "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-                "childCatenaXId": "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301",
+                "childCatenaXId": "urn:uuid:94d086c6-0124-4f2c-86b2-1d419e47499d",
                 "hasAlternatives": false
             },
             "aspectType": "SingleLevelBomAsPlanned",
-            "bpn": "BPNL00000003AXS3"
+            "bpn": "BPNL50096894aNXY"
         },
         {
-            "catenaXId": "urn:uuid:e8c48a8e-d2d7-43d9-a867-65c70c85f5b8",
+            "catenaXId": "urn:uuid:94d086c6-0124-4f2c-86b2-1d419e47499d",
             "linkedItem": {
                 "quantity": {
-                    "quantityNumber": 1580.0,
+                    "quantityNumber": 1.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:gram"
+                        "lexicalValue": "unit:piece"
                     }
                 },
                 "lifecycleContext": "asPlanned",
                 "assembledOn": "2022-02-03T14:48:54.709Z",
                 "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-                "childCatenaXId": "urn:uuid:94d086c6-0124-4f2c-86b2-1d419e47499d",
+                "childCatenaXId": "urn:uuid:b0926d3c-6a8f-4fc7-81a4-88c50817358a",
                 "hasAlternatives": false
             },
             "aspectType": "SingleLevelBomAsPlanned",
             "bpn": "BPNL50096894aNXY"
         },
         {
-            "catenaXId": "urn:uuid:94d086c6-0124-4f2c-86b2-1d419e47499d",
+            "catenaXId": "urn:uuid:e3e2a4d8-58bc-4ae9-afa2-e8946fda1f77",
             "linkedItem": {
                 "quantity": {
                     "quantityNumber": 1.0,
                     "measurementUnit": {
                         "datatypeURI": null,
-                        "lexicalValue": "unit:litre"
+                        "lexicalValue": "unit:piece"
                     }
                 },
                 "lifecycleContext": "asPlanned",
                 "assembledOn": "2022-02-03T14:48:54.709Z",
                 "lastModifiedOn": "2022-02-03T14:48:54.709Z",
-                "childCatenaXId": "urn:uuid:b0926d3c-6a8f-4fc7-81a4-88c50817358a",
+                "childCatenaXId": "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301",
                 "hasAlternatives": false
             },
             "aspectType": "SingleLevelBomAsPlanned",
-            "bpn": "BPNL50096894aNXY"
+            "bpn": "BPNL00000003AXS3"
         }
     ]
 }
\ No newline at end of file
diff --git a/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-submodels.json b/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-submodels.json
index 7d47f7f5bf..015f05ae38 100644
--- a/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-submodels.json
+++ b/irs-cucumber-tests/src/test/resources/expected-files/TRI-893-expected-submodels.json
@@ -1,99 +1,129 @@
 {
     "submodels": [
         {
-            "identification": "urn:uuid:cd43ab3a-83c3-42a5-9c93-53a82223c7b8",
-            "aspectType": "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned",
+            "identification": "urn:uuid:b82ebca3-b462-4ad3-9cfd-d79b3958e580",
+            "aspectType": "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned",
+            "contractAgreementId": "M2U1NzRlNGEtZDhkNS00YmE3LTlhZmQtYWQ2MDBmMmY1ZjZm:dXJuOnV1aWQ6NDllYjUwMmItZTY4Yi00YjhhLTk3MjctN2M4NWRlMjUzODZh:OTA1ZWJlNGYtZTI5OC00YmU1LThiNmMtMzAyYmJiODg2Nzc0",
             "payload": {
-                "validityPeriod": {
-                    "validFrom": "2018-08-15T15:18:04.000Z",
-                    "validTo": "2028-05-14T00:23:55.000Z"
-                },
                 "catenaXId": "urn:uuid:65e1554e-e5cd-4560-bac1-1352582122fb",
                 "partTypeInformation": {
                     "manufacturerPartId": "XK-34",
                     "classification": "product",
                     "nameAtManufacturer": "Vehicle Model C"
-                }
-            }
-        },
-        {
-            "identification": "urn:uuid:8d5bcf49-7d09-4d98-a3b6-3e4253f5bb46",
-            "aspectType": "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned",
-            "payload": {
-                "validityPeriod": {
-                    "validFrom": "2018-09-16T00:07:10.000Z",
-                    "validTo": "2032-01-10T15:26:52.000Z"
                 },
-                "catenaXId": "urn:uuid:e3e2a4d8-58bc-4ae9-afa2-e8946fda1f77",
-                "partTypeInformation": {
-                    "manufacturerPartId": "39478586-36",
-                    "classification": "product",
-                    "nameAtManufacturer": "Tier B ECU2"
-                }
+                "partSitesInformationAsPlanned": [
+                    {
+                        "functionValidUntil": "2023-12-11T06:14:55.183Z",
+                        "catenaXsiteId": "BPNS1234567890ZZ",
+                        "function": "production",
+                        "functionValidFrom": "2023-12-11T06:14:55.181Z"
+                    }
+                ]
             }
         },
         {
-            "identification": "urn:uuid:6692c07a-6771-48a2-a729-331d1a488037",
-            "aspectType": "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned",
+            "identification": "urn:uuid:724afc8f-240f-40ad-98f0-5fa03d97164e",
+            "aspectType": "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned",
+            "contractAgreementId": "M2U1NzRlNGEtZDhkNS00YmE3LTlhZmQtYWQ2MDBmMmY1ZjZm:dXJuOnV1aWQ6NDllYjUwMmItZTY4Yi00YjhhLTk3MjctN2M4NWRlMjUzODZh:OTA1ZWJlNGYtZTI5OC00YmU1LThiNmMtMzAyYmJiODg2Nzc0",
             "payload": {
-                "validityPeriod": {
-                    "validFrom": "2019-11-02T11:14:15.000Z",
-                    "validTo": "2024-07-17T02:07:07.000Z"
-                },
                 "catenaXId": "urn:uuid:e8c48a8e-d2d7-43d9-a867-65c70c85f5b8",
                 "partTypeInformation": {
                     "manufacturerPartId": "123564887-01",
                     "classification": "product",
                     "nameAtManufacturer": "Tire Model A"
-                }
+                },
+                "partSitesInformationAsPlanned": [
+                    {
+                        "functionValidUntil": "2023-12-11T06:14:55.183Z",
+                        "catenaXsiteId": "BPNS1234567890ZZ",
+                        "function": "production",
+                        "functionValidFrom": "2023-12-11T06:14:55.181Z"
+                    }
+                ]
             }
         },
         {
-            "identification": "urn:uuid:879aef49-f000-4f1a-b749-def9d4807b22",
-            "aspectType": "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned",
+            "identification": "urn:uuid:e1a2222c-6d93-46d5-99d4-b3b396511179",
+            "aspectType": "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned",
+            "contractAgreementId": "MDRmZjRhZmYtZGRlOS00MmRlLWFiMmYtN2U1MzY0NDcxNTUx:dXJuOnV1aWQ6MmJhZDFjNDktNGRjMC00NDE2LWI2ZGEtZTJlODllOWQwYmY0:NDdkNGI0OGEtMGFjZS00ODE5LTk2OWYtYWYzZWU1YTg1ZWQw",
             "payload": {
-                "validityPeriod": {
-                    "validFrom": "2019-08-17T14:14:30.000Z",
-                    "validTo": "2032-08-30T04:32:28.000Z"
-                },
-                "catenaXId": "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301",
+                "catenaXId": "urn:uuid:94d086c6-0124-4f2c-86b2-1d419e47499d",
                 "partTypeInformation": {
-                    "manufacturerPartId": "6775244-06",
+                    "manufacturerPartId": "9953421-03",
                     "classification": "product",
-                    "nameAtManufacturer": "Sub Tier B Glue"
-                }
+                    "nameAtManufacturer": "Natural Rubber Product(40KG blocks)"
+                },
+                "partSitesInformationAsPlanned": [
+                    {
+                        "functionValidUntil": "2023-12-11T06:14:55.183Z",
+                        "catenaXsiteId": "BPNS1234567890ZZ",
+                        "function": "production",
+                        "functionValidFrom": "2023-12-11T06:14:55.181Z"
+                    }
+                ]
             }
         },
         {
-            "identification": "urn:uuid:bcfeab97-b97b-47c4-8fae-9f88e83d4579",
-            "aspectType": "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned",
+            "identification": "urn:uuid:26f72cc4-5a15-4b26-b3b7-323093c57a53",
+            "aspectType": "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned",
+            "contractAgreementId": "M2U1NzRlNGEtZDhkNS00YmE3LTlhZmQtYWQ2MDBmMmY1ZjZm:dXJuOnV1aWQ6NDllYjUwMmItZTY4Yi00YjhhLTk3MjctN2M4NWRlMjUzODZh:OTA1ZWJlNGYtZTI5OC00YmU1LThiNmMtMzAyYmJiODg2Nzc0",
             "payload": {
-                "validityPeriod": {
-                    "validFrom": "2017-04-29T01:48:37.000Z",
-                    "validTo": "2029-08-26T00:42:55.000Z"
-                },
-                "catenaXId": "urn:uuid:94d086c6-0124-4f2c-86b2-1d419e47499d",
+                "catenaXId": "urn:uuid:e3e2a4d8-58bc-4ae9-afa2-e8946fda1f77",
                 "partTypeInformation": {
-                    "manufacturerPartId": "9953421-03",
+                    "manufacturerPartId": "39478586-36",
                     "classification": "product",
-                    "nameAtManufacturer": "Natural Rubber Product(40KG blocks)"
-                }
+                    "nameAtManufacturer": "Tier B ECU2"
+                },
+                "partSitesInformationAsPlanned": [
+                    {
+                        "functionValidUntil": "2023-12-11T06:14:55.183Z",
+                        "catenaXsiteId": "BPNS1234567890ZZ",
+                        "function": "production",
+                        "functionValidFrom": "2023-12-11T06:14:55.181Z"
+                    }
+                ]
             }
         },
         {
-            "identification": "urn:uuid:374b82cd-8038-4feb-8ae8-f9907c082623",
-            "aspectType": "urn:bamm:io.catenax.part_as_planned:1.0.1#PartAsPlanned",
+            "identification": "urn:uuid:e16c4427-512d-455e-8baa-6cc3a7d0602c",
+            "aspectType": "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned",
+            "contractAgreementId": "ZWIxNmYxNDItMTUxMC00MDQyLTkyZTgtOTE5OTAwYzY5ODVj:dXJuOnV1aWQ6NDk1MGQ0ZmMtOTA5ZC00ZGNmLTg0OTYtMzg0NWQ1YmQ2Zjc2:NWI2NTdkOWQtNTIyOS00NmY2LWFkNDctZTBiZmYyMmQ2OGMw",
             "payload": {
-                "validityPeriod": {
-                    "validFrom": "2014-02-07T16:56:02.000Z",
-                    "validTo": "2029-08-26T11:05:18.000Z"
-                },
                 "catenaXId": "urn:uuid:b0926d3c-6a8f-4fc7-81a4-88c50817358a",
                 "partTypeInformation": {
                     "manufacturerPartId": "A26581-11",
                     "classification": "product",
                     "nameAtManufacturer": "Natural Rubber"
-                }
+                },
+                "partSitesInformationAsPlanned": [
+                    {
+                        "functionValidUntil": "2023-12-11T06:14:55.183Z",
+                        "catenaXsiteId": "BPNS1234567890ZZ",
+                        "function": "production",
+                        "functionValidFrom": "2023-12-11T06:14:55.181Z"
+                    }
+                ]
+            }
+        },
+        {
+            "identification": "urn:uuid:176135ea-f47f-49f1-a077-997bf1d44c89",
+            "aspectType": "urn:samm:io.catenax.part_as_planned:2.0.0#PartAsPlanned",
+            "contractAgreementId": "ZWIxNmYxNDItMTUxMC00MDQyLTkyZTgtOTE5OTAwYzY5ODVj:dXJuOnV1aWQ6NDk1MGQ0ZmMtOTA5ZC00ZGNmLTg0OTYtMzg0NWQ1YmQ2Zjc2:NWI2NTdkOWQtNTIyOS00NmY2LWFkNDctZTBiZmYyMmQ2OGMw",
+            "payload": {
+                "catenaXId": "urn:uuid:3cdd2826-5df0-4c7b-b540-9eeccecb2301",
+                "partTypeInformation": {
+                    "manufacturerPartId": "6775244-06",
+                    "classification": "product",
+                    "nameAtManufacturer": "Sub Tier B Glue"
+                },
+                "partSitesInformationAsPlanned": [
+                    {
+                        "functionValidUntil": "2023-12-11T06:14:55.183Z",
+                        "catenaXsiteId": "BPNS1234567890ZZ",
+                        "function": "production",
+                        "functionValidFrom": "2023-12-11T06:14:55.181Z"
+                    }
+                ]
             }
         }
     ]
diff --git a/local/testing/api-tests/README.md b/local/testing/api-tests/README.md
index 8d9cf5a460..8f733c79d5 100644
--- a/local/testing/api-tests/README.md
+++ b/local/testing/api-tests/README.md
@@ -26,13 +26,15 @@ export ADMIN_USER_API_KEY=
 export REGULAR_USER_API_KEY_ESS=
 export ADMIN_USER_API_KEY_ESS=
 ```
-6. Execute tests
-    
-   1. Run all tests
-        ```console
-          source variable.env
-          py -m pytest local/testing/api-tests/irs-api-tests.tavern.yaml
-        ```
+* Execute command 
+
+- Note: Execute command from irs root directory ..\item-relationship-service
+
+```console
+  source local/testing/api-tests/variable.env && python -m pytest local/testing/api-tests/irs-api-tests.tavern.yaml
+```
+
+
 
    2. To run a single test:
         ```console