diff --git a/src/assets/MOCK/dppv2.json b/src/assets/MOCK/dppv2.json
new file mode 100644
index 000000000..352752eb0
--- /dev/null
+++ b/src/assets/MOCK/dppv2.json
@@ -0,0 +1,452 @@
+{
+  "metadata": {
+    "contract": {
+      "@id": "9b3c0977-6b14-4201-bd76-55f681a92872",
+      "@type": "dcat:Dataset",
+      "odrl:hasPolicy": {
+        "@id": "3:365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918:dc616f20-2781-450a-837a-290d861c8e0a",
+        "@type": "odrl:Set",
+        "odrl:permission": [],
+        "odrl:prohibition": [],
+        "odrl:obligation": [],
+        "odrl:target": "365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918"
+      },
+      "dcat:distribution": [
+        {
+          "@type": "dcat:Distribution",
+          "dct:format": {
+            "@id": "HttpProxy"
+          },
+          "dcat:accessService": "1795254a-e354-46c7-9d88-04608b05ca9f"
+        },
+        {
+          "@type": "dcat:Distribution",
+          "dct:format": {
+            "@id": "AmazonS3"
+          },
+          "dcat:accessService": "1795254a-e354-46c7-9d88-04608b05ca9f"
+        }
+      ],
+      "edc:description": "Battery Passport test data",
+      "edc:id": "365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918"
+    },
+    "negotiation": {
+      "init": {
+        "request": {
+          "@context": {
+            "odrl": "http://www.w3.org/ns/odrl/2/"
+          },
+          "@type": "NegotiationInitiateRequestDto",
+          "connectorAddress": "https://materialpass.dev.demo.catena-x.net/BPNL000000000000/api/v1/dsp",
+          "protocol": "dataspace-protocol-http",
+          "connectorId": "BPNL00000000CBA5",
+          "offer": {
+            "offerId": "3:365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918:dc616f20-2781-450a-837a-290d861c8e0a",
+            "assetId": "365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918",
+            "policy": {
+              "@type": "odrl:Set",
+              "odrl:permission": [],
+              "odrl:prohibition": [],
+              "odrl:obligation": [],
+              "odrl:target": "365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918"
+            }
+          }
+        },
+        "response": {
+          "@id": "b8a41089-1eac-462a-b8e8-e40f724b302f",
+          "@type": "edc:IdResponseDto",
+          "edc:createdAt": 1688393629505,
+          "@context": {
+            "dct": "https://purl.org/dc/terms/",
+            "tx": "https://w3id.org/tractusx/v0.0.1/ns/",
+            "edc": "https://w3id.org/edc/v0.0.1/ns/",
+            "dcat": "https://www.w3.org/ns/dcat/",
+            "odrl": "http://www.w3.org/ns/odrl/2/",
+            "dspace": "https://w3id.org/dspace/v0.8/"
+          }
+        }
+      },
+      "get": {
+        "response": {
+          "@id": "b8a41089-1eac-462a-b8e8-e40f724b302f",
+          "@type": "edc:ContractNegotiationDto",
+          "edc:type": "CONSUMER",
+          "edc:protocol": "dataspace-protocol-http",
+          "edc:state": "FINALIZED",
+          "edc:counterPartyAddress": "https://materialpass.dev.demo.catena-x.net/BPNL000000000000/api/v1/dsp",
+          "edc:callbackAddresses": [],
+          "edc:contractAgreementId": "3:365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918:102bae7a-22de-44b2-9ed5-ca5f62023390",
+          "@context": {
+            "dct": "https://purl.org/dc/terms/",
+            "tx": "https://w3id.org/tractusx/v0.0.1/ns/",
+            "edc": "https://w3id.org/edc/v0.0.1/ns/",
+            "dcat": "https://www.w3.org/ns/dcat/",
+            "odrl": "http://www.w3.org/ns/odrl/2/",
+            "dspace": "https://w3id.org/dspace/v0.8/"
+          }
+        }
+      }
+    },
+    "transfer": {
+      "init": {
+        "request": {
+          "@context": {
+            "odrl": "http://www.w3.org/ns/odrl/2/"
+          },
+          "assetId": "365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918",
+          "connectorAddress": "https://materialpass.dev.demo.catena-x.net/BPNL000000000000/api/v1/dsp",
+          "contractId": "3:365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918:102bae7a-22de-44b2-9ed5-ca5f62023390",
+          "dataDestination": {
+            "properties": {
+              "type": "HttpProxy"
+            }
+          },
+          "managedResources": false,
+          "privateProperties": {
+            "receiverHttpEndpoint": "https://materialpass.dev.demo.catena-x.net/endpoint/bb8d235e-96c1-4fa3-a9ea-2ec71255ed18"
+          },
+          "protocol": "dataspace-protocol-http",
+          "transferType": {
+            "contentType": "application/octet-stream",
+            "isFinite": true
+          }
+        },
+        "response": {
+          "@id": "b9ab18f2-b624-4e2c-a922-c2e727467bb2",
+          "@type": "edc:IdResponseDto",
+          "edc:createdAt": 1688393631831,
+          "@context": {
+            "dct": "https://purl.org/dc/terms/",
+            "tx": "https://w3id.org/tractusx/v0.0.1/ns/",
+            "edc": "https://w3id.org/edc/v0.0.1/ns/",
+            "dcat": "https://www.w3.org/ns/dcat/",
+            "odrl": "http://www.w3.org/ns/odrl/2/",
+            "dspace": "https://w3id.org/dspace/v0.8/"
+          }
+        }
+      },
+      "get": {
+        "response": {
+          "@id": "b9ab18f2-b624-4e2c-a922-c2e727467bb2",
+          "@type": "edc:TransferProcessDto",
+          "edc:state": "COMPLETED",
+          "edc:stateTimestamp": 1688393633142,
+          "edc:type": "CONSUMER",
+          "edc:callbackAddresses": [],
+          "edc:dataDestination": {
+            "edc:type": "HttpProxy"
+          },
+          "edc:dataRequest": {
+            "@id": "b9ab18f2-b624-4e2c-a922-c2e727467bb2",
+            "@type": "edc:DataRequestDto",
+            "edc:assetId": "365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918",
+            "edc:contractId": "3:365e6fbe-bb34-11ec-8422-0242ac120002-61125dc3-5e6f-4f4b-838d-447432b97918:102bae7a-22de-44b2-9ed5-ca5f62023390"
+          },
+          "edc:receiverHttpEndpoint": "https://materialpass.dev.demo.catena-x.net/endpoint/bb8d235e-96c1-4fa3-a9ea-2ec71255ed18",
+          "@context": {
+            "dct": "https://purl.org/dc/terms/",
+            "tx": "https://w3id.org/tractusx/v0.0.1/ns/",
+            "edc": "https://w3id.org/edc/v0.0.1/ns/",
+            "dcat": "https://www.w3.org/ns/dcat/",
+            "odrl": "http://www.w3.org/ns/odrl/2/",
+            "dspace": "https://w3id.org/dspace/v0.8/"
+          }
+        }
+      }
+    }
+  },
+  "semanticId": "general",
+  "aspect": {
+    "typology": {
+      "shortName": "8HP60",
+      "class": {
+        "definition": "Manual transmission (motor vehicle)",
+        "code": "44-09-02-02"
+      },
+      "longName": "Product Description long text"
+    },
+    "metadata": {
+      "predecessor": "null",
+      "issueDate": "2000-01-01",
+      "version": "1.0.0",
+      "economicOperator": {
+        "legitimization": "DE123456789",
+        "identification": "BPNL1234567890ZZ"
+      },
+      "status": "draft",
+      "expirationDate": "2000-01-01"
+    },
+    "characteristics": {
+      "physicalDimension": {
+        "grossWeight": {
+          "value": 20.5,
+          "unit": "unit:kilogram"
+        },
+        "weightOrVolume": {
+          "left": {
+            "value": 20.5,
+            "unit": "unit:cubicMetre"
+          }
+        },
+        "diameter": {
+          "value": 20.5,
+          "unit": "unit:millimetre"
+        },
+        "grossVolume": {
+          "value": 20.5,
+          "unit": "unit:cubicMetre"
+        },
+        "width": {
+          "value": 20.5,
+          "unit": "unit:millimetre"
+        },
+        "length": {
+          "value": 20.5,
+          "unit": "unit:millimetre"
+        },
+        "height": {
+          "value": 20.5,
+          "unit": "unit:millimetre"
+        }
+      },
+      "lifespan": [
+        {
+          "value": 36,
+          "unit": "unit:day",
+          "key": "guaranteed lifetime"
+        }
+      ],
+      "physicalState": "solid"
+    },
+    "commercial": {
+      "placedOnMarket": "2000-01-01"
+    },
+    "identification": {
+      "localIdentifier": {
+        "value": "SN12345678",
+        "key": "PartInstanceId"
+      },
+      "additionalCode": [
+        {
+          "value": "8703 24 10 00",
+          "key": "TARIC"
+        }
+      ],
+      "dataCarrier": {
+        "carrierType": "QR",
+        "carrierLayout": "upper-left side"
+      }
+    },
+    "sources": [
+      {
+        "header": "Sustainability Document Material XY",
+        "category": "Product Specifications",
+        "type": "URL",
+        "content": "www.alink.pdf"
+      }
+    ],
+    "handling": {
+      "spareParts": {
+        "left": {
+          "producer": [
+            {
+              "id": "BPNL1234567890ZZ"
+            }
+          ],
+          "part": [
+            {
+              "name": "Aluminum Housing",
+              "gtin": "12345678"
+            }
+          ]
+        }
+      },
+      "substanceOfConcern": {
+        "left": [
+          {
+            "name": {
+              "name": "phenolphthalein",
+              "type": "IUPAC"
+            },
+            "location": "Housing",
+            "unit": "unit:partPerMillion",
+            "concentration": {
+              "left": [
+                {
+                  "max": 2.6,
+                  "min": 2.1
+                }
+              ]
+            },
+            "exemption": "shall not apply to product x containing not more than 1,5 ml of liquid",
+            "id": [
+              {
+                "type": "CAS",
+                "id": "201-004-7"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "additionalData": [
+      {
+        "description": "This is the machine parameters that are produced when the machine is used",
+        "label": "Specific Manufacturer Machine Parameters",
+        "type": {
+          "typeUnit": null,
+          "dataType": "object"
+        },
+        "children": [
+          {
+            "description": "The usage of the eletricity in the machine",
+            "label": "Eletricity Usage",
+            "type": {
+              "typeUnit": "unit:volts",
+              "dataType": "integer"
+            },
+            "data": "25"
+          },
+          {
+            "description": "The name of the machine that produced the product",
+            "label": "Machine Name",
+            "type": {
+              "typeUnit": null,
+              "dataType": "string"
+            },
+            "data": "Laser Machine MX-421W"
+          },
+          {
+            "description": "The list of products the machine can produce",
+            "label": "Product Names",
+            "type": {
+              "typeUnit": null,
+              "dataType": "array"
+            },
+            "data": [
+              "Tranmissions",
+              "Batteries",
+              "Seats",
+              "Doors"
+            ]
+          }
+        ]
+      },
+      {
+        "description": "This are the properties of interest",
+        "label": "Properties of Interest",
+        "type": {
+          "typeUnit": null,
+          "dataType": "object"
+        },
+        "children":[
+          {
+            "description": "This are the main properties of interest",
+            "label": "Main Properties",
+            "type": {
+              "typeUnit": null,
+              "dataType": "object"
+            },
+            "children":[
+              {
+                "description": "This is the Normal temperature of production",
+                "label": "Normal Temperature",
+                "type": {
+                  "typeUnit": "unit:celcius",
+                  "dataType": "float"
+                },
+                "data": 62.7
+              },
+              {
+                "description": "This is the minimmum temperature of production",
+                "label": "Minimum Temperature",
+                "type": {
+                  "typeUnit": "unit:celcius",
+                  "dataType": "float"
+                },
+                "data": -80.68
+              },
+              {
+                "description": "This is the maximum temperature of production",
+                "label": "Maximum Temperature",
+                "type": {
+                  "typeUnit": "unit:celcius",
+                  "dataType": "float"
+                },
+                "data": 800.85
+              }
+            ]
+          }
+        ]
+      }
+    ],
+    "sustainability": {
+      "PEF": {
+        "carbon": [
+          {
+            "lifecycle": "main product production",
+            "rulebook": "https://www.alink.pdf/",
+            "unit": "kg CO2 eq",
+            "type": "Climate Change Total",
+            "value": 12.678
+          }
+        ],
+        "carbon2": {
+          "lifecycle": "main product production",
+          "rulebook": "https://www.alink.pdf/",
+          "unit": "kg CO2 eq",
+          "type": "Climate Change Total",
+          "value": 12.678
+        },
+        "environmental": [
+          {
+            "lifecycle": "main product production",
+            "rulebook": "https://www.alink.pdf/",
+            "unit": "kg CO2 eq",
+            "type": "Climate Change Total",
+            "value": 72.678
+          }
+        ]
+      },
+      "state": "first life",
+      "material": {
+        "left": [
+          {
+            "name": {
+              "name": "phenolphthalein",
+              "type": "IUPAC"
+            },
+            "unit": "unit:partPerMillion",
+            "recycled": false,
+            "id": [
+              {
+                "type": "CAS",
+                "id": "201-004-7"
+              }
+            ],
+            "value": 5,
+            "renewable": true
+          }
+        ]
+      },
+      "critical": {
+        "left": [
+          "eOMtThyhVNLWUZNRcBaQKxI"
+        ]
+      }
+    },
+    "operation": {
+      "importer": {
+        "left": {
+          "eori": "GB123456789000",
+          "id": "BPNL1234567890ZZ"
+        }
+      },
+      "manufacturer": {
+        "facility": "BPNS1234567890ZZ",
+        "manufacturingDate": "2000-01-31",
+        "manufacturer": "BPNL1234567890ZZ"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/assets/styles/components/passport/additionalData.scss b/src/assets/styles/components/passport/additionalData.scss
new file mode 100644
index 000000000..8616ac12f
--- /dev/null
+++ b/src/assets/styles/components/passport/additionalData.scss
@@ -0,0 +1,37 @@
+/**
+ * Catena-X - Product Passport Consumer Frontend
+ *
+ * Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the
+ * License for the specific language govern in permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+.additional-data {
+  .column {
+    border: 2px solid #f4fbfd;
+    border-radius: 10px;
+    padding: 7px 7px 10px 7px !important;
+    margin: 6px !important;
+  }
+  .container-label {
+    padding: 10px 0;
+    max-height: 60%;
+    cursor: pointer;
+    font-weight: 800;
+    color: $catena-x-blue;
+  }
+}
diff --git a/src/assets/styles/main.scss b/src/assets/styles/main.scss
index c0c32b439..126542eaf 100644
--- a/src/assets/styles/main.scss
+++ b/src/assets/styles/main.scss
@@ -32,6 +32,7 @@
 @import "components/general/recursiveTree";
 @import "components/passport/documentField";
 @import "components/passport/field";
+@import "components/passport/additionalData";
 @import "components/passport/cards";
 @import "components/landing/searchView";
 @import "components/passport/sections";
diff --git a/src/components/general/RecursiveAdditionalData.vue b/src/components/general/RecursiveAdditionalData.vue
new file mode 100644
index 000000000..d7c4e6d06
--- /dev/null
+++ b/src/components/general/RecursiveAdditionalData.vue
@@ -0,0 +1,88 @@
+<!--
+  Catena-X - Product Passport Consumer Frontend
+ 
+  Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA
+ 
+  See the NOTICE file(s) distributed with this work for additional
+  information regarding copyright ownership.
+ 
+  This program and the accompanying materials are made available under the
+  terms of the Apache License, Version 2.0 which is available at
+  https://www.apache.org/licenses/LICENSE-2.0.
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the
+  License for the specific language govern in permissions and limitations
+  under the License.
+ 
+  SPDX-License-Identifier: Apache-2.0
+-->
+
+<template>
+  <div class="additional-data">
+    <!-- eslint-disable-next-line vue/no-v-for-template-key -->
+    <template v-for="attribute in jsonData.children" :key="attribute">
+      <template v-if="attribute.type.dataType !== 'object'">
+        <DialogComponent class="field-dialog">
+          <Field
+            info
+            :icon="callIconFinder(attribute.label)"
+            :label="attribute.label"
+            :value="processValue(attribute)"
+            :unit="attribute.type.typeUnit ? attribute.type.typeUnit : ''"
+          />
+          <template v-slot:text>
+            {{ attribute.description }}
+          </template>
+        </DialogComponent>
+      </template>
+      <template v-else>
+        <DialogComponent class="field-dialog">
+          <div class="column">
+            <div class="container-label">{{ attribute.label }}</div>
+          </div>
+          <template v-slot:text>
+            {{ attribute.description }}
+          </template>
+        </DialogComponent>
+        <template v-if="attribute.children">
+          <recursive-additional-data :jsonData="attribute" />
+        </template>
+      </template>
+    </template>
+  </div>
+</template>
+
+<script>
+import passportUtil from "@/utils/passportUtil.js";
+import Field from "../passport/Field.vue";
+import DialogComponent from "../general/Dialog.vue";
+export default {
+  name: "RecursiveAdditionalData",
+  components: {
+    Field,
+    DialogComponent,
+  },
+  props: {
+    jsonData: {
+      type: [Object, Array],
+    },
+  },
+
+  methods: {
+    callIconFinder(unit) {
+      return passportUtil.iconFinder(unit);
+    },
+    processValue(attribute) {
+      if (attribute.type.dataType == "array" && Array.isArray(attribute.data)) {
+        return attribute.data.join(", ");
+      } else {
+        return attribute.data;
+      }
+    },
+  },
+};
+</script>
+
diff --git a/src/components/passport/GeneralCards.vue b/src/components/passport/GeneralCards.vue
index 21567edfa..1b6b95c05 100644
--- a/src/components/passport/GeneralCards.vue
+++ b/src/components/passport/GeneralCards.vue
@@ -96,13 +96,13 @@ export default {
         {
           title: "GENERAL",
           label: "Product name",
-          secondLabel: "Product type",
+          secondLabel: "Product code",
           icon: "mdi-pound",
           value: this.$props.data.aspect.typology
-            ? this.$props.data.aspect.typology.name
+            ? this.$props.data.aspect.typology.shortName
             : "-",
           secondValue: this.$props.data.aspect.typology
-            ? this.$props.data.aspect.typology.nameAtCustomer
+            ? this.$props.data.aspect.typology.class.code
             : "-",
         },
         {
@@ -111,12 +111,10 @@ export default {
           secondLabel: "Date of Manufacturing",
           icon: "mdi-chart-timeline-variant-shimmer",
           value: this.$props.data.aspect.operation.manufacturer
-            ? this.$props.data.aspect.operation.manufacturer.manufacturerId
+            ? this.$props.data.aspect.operation.manufacturer.manufacturer
             : "-",
-          secondValue: this.$props.data.aspect.serialization
-            .manufacturingInformation
-            ? this.$props.data.aspect.serialization.manufacturingInformation
-                .date
+          secondValue: this.$props.data.aspect.operation.manufacturer
+            ? this.$props.data.aspect.operation.manufacturer.manufacturingDate
             : "-",
           description: {
             title: "Manufacturing",
@@ -138,17 +136,13 @@ export default {
         {
           title: "SUSTAINABILITY",
           label: "Total CO2 footprint",
-          secondLabel: "Warranty period",
+          secondLabel: "Placed on market",
           icon: "mdi-leaf",
-          value: this.$props.data.aspect.sustainability.carbonFootprint
-            ? this.$props.data.aspect.sustainability.carbonFootprint
-                .carbonContentTotal
+          value: this.$props.data.aspect.sustainability["PEF"].carbon
+            ? this.$props.data.aspect.sustainability["PEF"].carbon[0].value
             : "-",
           valueUnits: "t CO2 Total",
-          secondValue: this.$props.data.aspect.commercial.warranty,
-          secondValueUnits: this.$props.data.aspect.commercial.warranty
-            ? "months"
-            : "",
+          secondValue: this.$props.data.aspect.commercial.placedOnMarket,
           description: {
             title: "Sustainability",
             value: "Description of the Sustainability",
diff --git a/src/components/passport/sections/AdditionalData.vue b/src/components/passport/sections/AdditionalData.vue
index 3942337a2..bb7b06a1d 100644
--- a/src/components/passport/sections/AdditionalData.vue
+++ b/src/components/passport/sections/AdditionalData.vue
@@ -22,16 +22,19 @@
 
 <template>
   <div class="section">
-    <v-container class="ma-0" v-for="attribute in propsData" :key="attribute">
+    <v-container class="ma-0">
       <v-row class="section">
-        <template v-if="attribute">
-          <v-col sm="12" md="4" class="pa-0 ma-0">
-            <Field
-              icon="mdi-image-size-select-small"
-              :label="attribute.label"
-              :value="attribute.data"
-              :unit="attribute.type.typeUnit"
-            />
+        <template v-if="propsData">
+          <v-col
+            v-for="(attr, key) in propsData"
+            :key="key"
+            sm="12"
+            :md="columnWidth"
+            class="pa-0 ma-0 column"
+          >
+            <div class="element-chart-label">{{ attr.label }}</div>
+
+            <RecursiveAdditionalData :jsonData="attr" />
           </v-col>
         </template>
       </v-row>
@@ -40,12 +43,12 @@
 </template>
 
 <script>
-import Field from "../Field.vue";
+import RecursiveAdditionalData from "../../general/RecursiveAdditionalData.vue";
 
 export default {
   name: "AdditionalDataComponent",
   components: {
-    Field,
+    RecursiveAdditionalData,
   },
   props: {
     data: {
@@ -56,7 +59,20 @@ export default {
   data() {
     return {
       propsData: this.$props.data.aspect.additionalData,
+      columnWidth: 6,
     };
   },
+  created() {
+    this.columnWidth = this.columnCounter(this.propsData);
+  },
+  methods: {
+    columnCounter(array) {
+      const maxGridSize = 12;
+      const columns = array.length;
+      const columnWidth = Math.max(1, Math.floor(maxGridSize / columns));
+      return columnWidth;
+    },
+  },
 };
 </script>
+
diff --git a/src/components/passport/sections/Characteristics.vue b/src/components/passport/sections/Characteristics.vue
index 57b581373..b56845e7d 100644
--- a/src/components/passport/sections/Characteristics.vue
+++ b/src/components/passport/sections/Characteristics.vue
@@ -24,48 +24,85 @@
   <div class="section">
     <v-container class="ma-0">
       <v-row class="section">
-        <template v-if="propsData.physicalDimensionsProperty">
+        <template v-if="propsData.physicalDimension">
           <v-col sm="12" md="4" class="pa-0 ma-0">
-            <Field
-              icon="mdi-image-size-select-small"
-              label="Physical dimensions property"
-              :width="propsData.physicalDimensionsProperty.width"
-              :length="propsData.physicalDimensionsProperty.length"
-              :height="propsData.physicalDimensionsProperty.height"
-            />
-            <Field
-              icon="mdi-arrow-down-circle-outline"
-              label="Weight"
-              :value="propsData.physicalDimensionsProperty.weight"
-              :unit="propsData.physicalDimensionsProperty.unit"
-            />
+            <div class="element-chart-label">Physical dimension</div>
+            <template v-if="propsData.physicalDimension.grossWeight">
+              <Field
+                :icon="callIconFinder('grossWeight')"
+                label="Gross weight"
+                :value="propsData.physicalDimension.grossWeight.value"
+                :unit="propsData.physicalDimension.grossWeight.unit"
+              />
+            </template>
+            <template v-if="propsData.physicalDimension.weightOrVolume.left">
+              <Field
+                :icon="callIconFinder('weightOrVolume')"
+                label="Weight or volume"
+                :value="propsData.physicalDimension.weightOrVolume.left.value"
+                :unit="propsData.physicalDimension.weightOrVolume.left.unit"
+              />
+            </template>
+            <template v-if="propsData.physicalDimension.diameter">
+              <Field
+                :icon="callIconFinder('diameter')"
+                label="Diameter"
+                :value="propsData.physicalDimension.diameter.value"
+                :unit="propsData.physicalDimension.diameter.unit"
+              />
+            </template>
+            <template v-if="propsData.physicalDimension.grossVolume">
+              <Field
+                :icon="callIconFinder('grossVolume')"
+                label="Gross volume"
+                :value="propsData.physicalDimension.grossVolume.value"
+                :unit="propsData.physicalDimension.grossVolume.unit"
+              />
+            </template>
+            <template v-if="propsData.physicalDimension.width">
+              <Field
+                :icon="callIconFinder('width')"
+                label="Width"
+                :value="propsData.physicalDimension.width.value"
+                :unit="propsData.physicalDimension.width.unit"
+              />
+            </template>
+            <template v-if="propsData.physicalDimension.length">
+              <Field
+                :icon="callIconFinder('length')"
+                label="Length"
+                :value="propsData.physicalDimension.length.value"
+                :unit="propsData.physicalDimension.length.unit"
+              />
+            </template>
+            <template v-if="propsData.physicalDimension.height">
+              <Field
+                :icon="callIconFinder('height')"
+                label="Height"
+                :value="propsData.physicalDimension.height.value"
+                :unit="propsData.physicalDimension.height.unit"
+              />
+            </template>
           </v-col>
         </template>
         <template v-if="propsData.lifespan">
           <v-col sm="12" md="4" class="pa-0 ma-0">
             <Field
-              icon="mdi-arrow-down-circle-outline"
+              v-for="attr in propsData.lifespan"
+              :key="attr"
+              :icon="callIconFinder('lifespan')"
               label="Lifespan"
-              :value="propsData.lifespan.value"
-              :unit="propsData.lifespan.unit"
+              :value="attr.value"
+              :unit="attr.unit"
             />
           </v-col>
         </template>
         <v-col sm="12" md="4" class="pa-0 ma-0">
-          <template v-if="propsData.energyCapacity">
+          <template v-if="propsData.physicalState">
             <Field
-              icon="mdi-arrow-down-circle-outline"
-              label="Energy capacity"
-              :value="propsData.energyCapacity.value"
-              :unit="propsData.energyCapacity.unit"
-            />
-          </template>
-          <template v-if="propsData.voltage">
-            <Field
-              icon="mdi-arrow-down-circle-outline"
-              label="Voltage"
-              :value="propsData.voltage.value"
-              :unit="propsData.voltage.unit"
+              :icon="callIconFinder('physicalState')"
+              label="Physical state"
+              :value="propsData.physicalState"
             />
           </template>
         </v-col>
@@ -76,6 +113,7 @@
 
 <script>
 import Field from "../Field.vue";
+import passportUtil from "@/utils/passportUtil.js";
 
 export default {
   name: "CharacteristicsComponent",
@@ -93,5 +131,10 @@ export default {
       propsData: this.$props.data.aspect.characteristics,
     };
   },
+  methods: {
+    callIconFinder(unit) {
+      return passportUtil.iconFinder(unit);
+    },
+  },
 };
 </script>
diff --git a/src/components/passport/sections/Commercial.vue b/src/components/passport/sections/Commercial.vue
index 923aae29a..9ee35564b 100644
--- a/src/components/passport/sections/Commercial.vue
+++ b/src/components/passport/sections/Commercial.vue
@@ -26,15 +26,10 @@
       <v-row class="section">
         <v-col sm="12" md="4" class="pa-0 ma-0">
           <Field
-            icon="mdi-image-size-select-small"
+            :icon="callIconFinder('placedOnMarket')"
             label="Place on the market"
             :value="propsData.placedOnMarket"
           />
-          <Field
-            icon="mdi-arrow-down-circle-outline"
-            label="Warranty"
-            :value="propsData.warranty"
-          />
         </v-col>
       </v-row>
     </v-container>
@@ -43,6 +38,7 @@
 
 <script>
 import Field from "../Field.vue";
+import passportUtil from "@/utils/passportUtil.js";
 
 export default {
   name: "CommercialComponent",
@@ -60,5 +56,10 @@ export default {
       propsData: this.$props.data.aspect.commercial,
     };
   },
+  methods: {
+    callIconFinder(unit) {
+      return passportUtil.iconFinder(unit);
+    },
+  },
 };
 </script>
diff --git a/src/components/passport/sections/Handling.vue b/src/components/passport/sections/Handling.vue
index 15b77750f..b03e963b9 100644
--- a/src/components/passport/sections/Handling.vue
+++ b/src/components/passport/sections/Handling.vue
@@ -24,37 +24,95 @@
   <div class="section">
     <v-container class="ma-0">
       <v-row class="section">
-        <template v-if="propsData.maintenanceHistory">
-          <v-col sm="12" md="4" class="pa-0 ma-0">
-            <DialogComponent class="field-dialog">
-              <AttributeField
-                icon="mdi-image-size-select-small"
-                label="Maintenance history"
-                :attributes-list="propsData.maintenanceHistory"
-              >
-                <template v-slot:text>
-                  {{ propsData.maintenanceHistory.description }}
-                </template>
-              </AttributeField>
-            </DialogComponent>
-          </v-col>
-        </template>
         <template v-if="propsData.spareParts">
           <v-col sm="12" md="4" class="pa-0 ma-0">
-            <AttributeField
-              icon="mdi-image-size-select-small"
-              label="Spare parts"
-              :attributes-list="propsData.spareParts"
-            />
+            <!-- eslint-disable-next-line vue/no-v-for-template-key -->
+            <template
+              v-for="attr in propsData.spareParts.left.producer"
+              :key="attr"
+            >
+              <Field
+                :icon="callIconFinder('producer')"
+                :value="attr.id"
+                label="Producer Id"
+              />
+            </template>
+            <template
+              v-for="attr in propsData.spareParts.left.part"
+              :key="attr"
+            >
+              <Field
+                :icon="callIconFinder('part')"
+                :value="attr.name"
+                label="Part name"
+              />
+              <Field
+                :icon="callIconFinder('part')"
+                :value="attr.gtin"
+                label="Part gtin"
+              />
+            </template>
           </v-col>
         </template>
         <template v-if="propsData.substanceOfConcern">
           <v-col sm="12" md="4" class="pa-0 ma-0">
-            <AttributeField
-              icon="mdi-image-size-select-small"
-              label="Substance of concern"
-              :attributes-list="propsData.substanceOfConcern"
-            />
+            <!-- eslint-disable-next-line vue/no-v-for-template-key -->
+            <template
+              v-for="attr in propsData.substanceOfConcern.left"
+              :key="attr"
+            >
+              <Field
+                :icon="callIconFinder('substanceOfConcern')"
+                :value="attr.name.name"
+                label="Substance of concern"
+              />
+              <Field
+                :icon="callIconFinder('type')"
+                :value="attr.name.type"
+                label="Type"
+              />
+              <Field
+                :icon="callIconFinder('location')"
+                :value="attr.location"
+                label="location"
+              />
+              <Field
+                :icon="callIconFinder('unit')"
+                :value="callUnitRemover(attr.unit)"
+                label="Unit"
+              />
+              <!-- eslint-disable-next-line vue/no-v-for-template-key -->
+              <template v-for="attr in attr.concentration.left" :key="attr">
+                <Field
+                  :icon="callIconFinder('unit')"
+                  :value="attr.max"
+                  label="Concentration max"
+                />
+                <Field
+                  :icon="callIconFinder('unit')"
+                  :value="attr.min"
+                  label="Concentration min"
+                />
+              </template>
+              <Field
+                :icon="callIconFinder('exemption')"
+                :value="attr.exemption"
+                label="Exemption"
+              />
+              <!-- eslint-disable-next-line vue/no-v-for-template-key -->
+              <template v-for="attr in attr.id" :key="attr">
+                <Field
+                  :icon="callIconFinder('type')"
+                  :value="attr.type"
+                  label="Id type"
+                />
+                <Field
+                  :icon="callIconFinder('type')"
+                  :value="attr.id"
+                  label="Id"
+                />
+              </template>
+            </template>
           </v-col>
         </template>
       </v-row>
@@ -63,14 +121,13 @@
 </template>
 
 <script>
-import AttributeField from "../AttributeField.vue";
-import DialogComponent from "../../general/Dialog.vue";
+import Field from "../Field.vue";
+import passportUtil from "@/utils/passportUtil.js";
 
 export default {
   name: "HandlingComponent",
   components: {
-    AttributeField,
-    DialogComponent,
+    Field,
   },
   props: {
     data: {
@@ -83,5 +140,13 @@ export default {
       propsData: this.$props.data.aspect.handling,
     };
   },
+  methods: {
+    callIconFinder(icon) {
+      return passportUtil.iconFinder(icon);
+    },
+    callUnitRemover(unit) {
+      return passportUtil.unitRemover(unit);
+    },
+  },
 };
 </script>
diff --git a/src/components/passport/sections/Identification.vue b/src/components/passport/sections/Identification.vue
index 01053d4d3..8cbc33dc7 100644
--- a/src/components/passport/sections/Identification.vue
+++ b/src/components/passport/sections/Identification.vue
@@ -25,57 +25,40 @@
     <v-container class="ma-0">
       <v-row class="section">
         <v-col sm="12" md="4" class="pa-0 ma-0">
-          <template v-if="propsData.manufacturerId">
+          <template v-if="propsData.localIdentifier">
             <Field
-              icon="mdi-arrow-down-circle-outline"
-              label="Manufacturer Id"
-              :value="propsData.manufacturerId"
-            />
-          </template>
-          <template v-if="propsData.localIdentifiers">
-            <!-- eslint-disable-next-line vue/no-v-for-template-key -->
-            <template v-for="attr in propsData.localIdentifiers" :key="attr">
-              <Field
-                icon="mdi-newspaper-variant-outline"
-                :value="attr.value"
-                :label="attr.key"
-              />
-            </template>
-          </template>
-          <template v-if="propsData.dataMatrixCode">
-            <Field
-              icon="mdi-arrow-down-circle-outline"
-              label="Data matrix code"
-              :value="propsData.dataMatrixCode"
+              :icon="callIconFinder('localIdentifiers')"
+              :value="propsData.localIdentifier.value"
+              :label="propsData.localIdentifier.key"
             />
           </template>
         </v-col>
         <v-col sm="12" md="4" class="pa-0 ma-0">
-          <template v-if="propsData.gtin">
-            <Field
-              icon="mdi-arrow-down-circle-outline"
-              label="Gtin"
-              :value="propsData.gtin"
-            />
-          </template>
           <template v-if="propsData.additionalCode">
             <!-- eslint-disable-next-line vue/no-v-for-template-key -->
             <template v-for="attr in propsData.additionalCode" :key="attr">
               <Field
-                icon="mdi-newspaper-variant-outline"
+                :icon="callIconFinder('additionalCode')"
                 :value="attr.value"
-                :label="attr.name"
+                :label="attr.key"
               />
             </template>
           </template>
+          <template v-if="propsData.dataCarrier">
+            <Field
+              :icon="callIconFinder('dataCarrier')"
+              :value="propsData.dataCarrier.carrierType"
+              :label="propsData.dataCarrier.carrierLayout"
+            />
+          </template>
         </v-col>
       </v-row>
     </v-container>
   </div>
 </template>
-
 <script>
 import Field from "../Field.vue";
+import passportUtil from "@/utils/passportUtil.js";
 
 export default {
   name: "IdentificationComponent",
@@ -93,5 +76,10 @@ export default {
       propsData: this.$props.data.aspect.identification,
     };
   },
+  methods: {
+    callIconFinder(unit) {
+      return passportUtil.iconFinder(unit);
+    },
+  },
 };
 </script>
diff --git a/src/components/passport/sections/Metadata.vue b/src/components/passport/sections/Metadata.vue
index 5e3a93164..415a80b61 100644
--- a/src/components/passport/sections/Metadata.vue
+++ b/src/components/passport/sections/Metadata.vue
@@ -26,41 +26,46 @@
       <v-row class="section">
         <v-col sm="12" md="4" class="pa-0 ma-0">
           <Field
-            icon="mdi-image-size-select-small"
+            :icon="callIconFinder('predecessor')"
+            label="Predecessor"
+            :value="propsData.predecessor"
+          />
+          <Field
+            :icon="callIconFinder('issueDate')"
             label="Issue date"
             :value="propsData.issueDate"
           />
           <Field
-            icon="mdi-arrow-down-circle-outline"
+            :icon="callIconFinder('version')"
             label="Version"
             :value="propsData.version"
           />
-          <Field
-            icon="mdi-arrow-down-circle-outline"
-            label="Validity date"
-            :value="propsData.validityDate"
-          />
         </v-col>
         <template v-if="propsData.economicOperator">
           <v-col sm="12" md="4" class="pa-0 ma-0">
             <Field
-              icon="mdi-lightning-bolt-outline"
-              label="Customer part Id"
-              :value="propsData.economicOperator.eori"
+              :icon="callIconFinder('legitimization')"
+              label="Legitimization"
+              :value="propsData.economicOperator.legitimization"
             />
             <Field
-              icon="mdi-arrow-bottom-right-thin-circle-outline"
-              label="Manufacturer part Id"
-              :value="propsData.economicOperator.id"
+              :icon="callIconFinder('identification')"
+              label="Identification"
+              :value="propsData.economicOperator.identification"
             />
           </v-col>
         </template>
         <v-col sm="12" md="4" class="pa-0 ma-0">
           <Field
-            icon="mdi-arrow-bottom-right-thin-circle-outline"
+            :icon="callIconFinder('status')"
             label="Status"
             :value="propsData.status"
           />
+          <Field
+            :icon="callIconFinder('expirationDate')"
+            label="Expiration date"
+            :value="propsData.expirationDate"
+          />
         </v-col>
       </v-row>
     </v-container>
@@ -69,6 +74,7 @@
 
 <script>
 import Field from "../Field.vue";
+import passportUtil from "@/utils/passportUtil.js";
 
 export default {
   name: "MetadataComponent",
@@ -86,5 +92,10 @@ export default {
       propsData: this.$props.data.aspect.metadata,
     };
   },
+  methods: {
+    callIconFinder(unit) {
+      return passportUtil.iconFinder(unit);
+    },
+  },
 };
 </script>
diff --git a/src/components/passport/sections/Operation.vue b/src/components/passport/sections/Operation.vue
index c43566c07..20f32952f 100644
--- a/src/components/passport/sections/Operation.vue
+++ b/src/components/passport/sections/Operation.vue
@@ -27,24 +27,31 @@
         <template v-if="propsData.importer">
           <v-col sm="12" md="4" class="pa-0 ma-0">
             <Field
-              icon="mdi-image-size-select-small"
-              label="Importer"
-              :value="propsData.importer"
+              :icon="callIconFinder('importer')"
+              label="Importer Id"
+              :value="propsData.importer.left.id"
             />
-            <template v-if="propsData.manufacturer">
-              <Field
-                icon="mdi-arrow-down-circle-outline"
-                label="Manufacturer Id"
-                :value="propsData.manufacturer.manufacturerId"
-              />
-              <Field
-                icon="mdi-arrow-down-circle-outline"
-                label="Facility Id"
-                :value="propsData.manufacturer.facilityId"
-              />
-            </template>
           </v-col>
         </template>
+        <v-col sm="12" md="4" class="pa-0 ma-0">
+          <template v-if="propsData.manufacturer">
+            <Field
+              :icon="callIconFinder('manufacturer')"
+              label="Manufacturer Id"
+              :value="propsData.manufacturer.manufacturer"
+            />
+            <Field
+              :icon="callIconFinder('facility')"
+              label="Facility Id"
+              :value="propsData.manufacturer.facility"
+            />
+            <Field
+              :icon="callIconFinder('manufacturingDate')"
+              label="Manufacturing date"
+              :value="propsData.manufacturer.manufacturingDate"
+            />
+          </template>
+        </v-col>
       </v-row>
     </v-container>
   </div>
@@ -52,6 +59,7 @@
 
 <script>
 import Field from "../Field.vue";
+import passportUtil from "@/utils/passportUtil.js";
 
 export default {
   name: "OperationComponent",
@@ -69,5 +77,10 @@ export default {
       propsData: this.$props.data.aspect.operation,
     };
   },
+  methods: {
+    callIconFinder(unit) {
+      return passportUtil.iconFinder(unit);
+    },
+  },
 };
 </script>
diff --git a/src/components/passport/sections/Sources.vue b/src/components/passport/sections/Sources.vue
index 72deff5ed..3dd84f754 100644
--- a/src/components/passport/sections/Sources.vue
+++ b/src/components/passport/sections/Sources.vue
@@ -24,28 +24,17 @@
   <div class="section">
     <v-container class="ma-0">
       <v-row class="section">
-        <template v-if="propsData.mandatory">
-          <v-col
-            v-for="(attr, key) in mappedSources"
-            :key="key"
-            sm="12"
-            md="3"
-            class="pa-0 ma-0"
-          >
-            <div class="element-chart-label">{{ key }}</div>
-            <div
-              v-for="(doc, index) in attr"
-              :key="index"
-              class="element-chart-label"
-            >
+        <template v-if="propsData">
+          <v-col sm="12" md="3" class="pa-0 ma-0">
+            <!-- eslint-disable-next-line vue/no-v-for-template-key -->
+            <template v-for="doc in propsData" :key="doc">
               <Field
-                :key="index"
-                icon="mdi-image-size-select-small"
+                :icon="callIconFinder('Sustainability')"
                 :label="doc.header"
                 :value="doc.content"
                 :link="doc.content"
               />
-            </div>
+            </template>
           </v-col>
         </template>
       </v-row>
@@ -71,11 +60,12 @@ export default {
   data() {
     return {
       propsData: this.$props.data.aspect.sources,
-      mappedSources: null,
     };
   },
-  created() {
-    this.mappedSources = passportUtil.groupSources(this.propsData);
+  methods: {
+    callIconFinder(unit) {
+      return passportUtil.iconFinder(unit);
+    },
   },
 };
 </script>
diff --git a/src/components/passport/sections/Sustainability.vue b/src/components/passport/sections/Sustainability.vue
index 4d4568fdb..931f39b7c 100644
--- a/src/components/passport/sections/Sustainability.vue
+++ b/src/components/passport/sections/Sustainability.vue
@@ -23,239 +23,85 @@
 <template>
   <div class="section">
     <v-container class="ma-0">
-      <template
-        v-if="
-          propsData.semanticId ==
-          'urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass'
-        "
-      >
-        <v-row class="section">
-          <v-col sm="12" md="4" class="pa-0 ma-0">
-            <template
-              v-if="propsData.aspect.sustainability.substancesOfConcern"
-            >
-              <div
-                v-for="(attr, index) in propsData.aspect.sustainability
-                  .substancesOfConcern"
-                :key="index"
-              >
+      <v-row class="section">
+        <v-col sm="12" md="4" class="pa-0 ma-0">
+          <template v-if="propsData['PEF']">
+            <template v-if="propsData['PEF'].carbon">
+              <template v-for="attr in propsData['PEF'].carbon" :key="attr">
                 <Field
-                  icon="mdi-image-size-select-small"
-                  label="Substances of concern"
-                  :value="attr"
+                  :icon="callIconFinder('carbon')"
+                  :label="attr.type"
+                  :value="attr.value"
+                  :unit="attr.unit"
                 />
-              </div>
-            </template>
-            <template
-              v-if="propsData.aspect.sustainability.responsibleSourcingDocument"
-            >
-              <InstructionsField
-                :field="
-                  propsData.aspect.sustainability.responsibleSourcingDocument
-                "
-              />
-            </template>
-          </v-col>
-          <template
-            v-if="
-              propsData.aspect.sustainability.substancesOfConcern ||
-              propsData.aspect.sustainability.criticalRawMaterials
-            "
-          >
-            <v-col sm="12" md="4" class="pa-0 ma-0">
-              <template
-                v-if="propsData.aspect.sustainability.substancesOfConcern"
-              >
-                <div
-                  v-for="(attr, key) in propsData.aspect.sustainability
-                    .recyclateContent"
-                  :key="key"
-                >
-                  <Field
-                    icon="mdi-image-size-select-small"
-                    :label="key"
-                    :value="attr"
-                  />
-                </div>
-              </template>
-              <template
-                v-if="propsData.aspect.sustainability.criticalRawMaterials"
-              >
-                <div
-                  v-for="(attr, key) in propsData.aspect.sustainability
-                    .criticalRawMaterials"
-                  :key="key"
-                >
-                  <Field
-                    icon="mdi-image-size-select-small"
-                    label="Critical raw materials"
-                    :value="attr"
-                  />
-                </div>
-              </template>
-            </v-col>
-          </template>
-
-          <template
-            v-if="
-              propsData.aspect.sustainability.carbonFootprint
-                .crossSectoralStandardsUsed ||
-              propsData.aspect.sustainability.carbonFootprint
-                .co2FootprintTotal ||
-              propsData.aspect.sustainability.carbonFootprint
-                .productOrSectorSpecificRules
-            "
-          >
-            <v-col sm="12" md="4" class="pa-0 ma-0">
-              <template
-                v-if="
-                  propsData.aspect.sustainability.carbonFootprint
-                    .crossSectoralStandardsUsed
-                "
-              >
-                <div
-                  v-for="(attr, key) in propsData.aspect.sustainability
-                    .carbonFootprint.crossSectoralStandardsUsed"
-                  :key="key"
-                >
-                  <Field
-                    icon="mdi-image-size-select-small"
-                    label="Cross sectoral standard"
-                    :value="attr.crossSectoralStandard"
-                  />
-                </div>
               </template>
+            </template>
+            <template v-if="propsData['PEF'].carbon">
               <template
-                v-if="
-                  propsData.aspect.sustainability.carbonFootprint
-                    .co2FootprintTotal
-                "
+                v-for="attr in propsData['PEF'].environmental"
+                :key="attr"
               >
                 <Field
-                  icon="mdi-image-size-select-small"
-                  label="Co2 footprint total"
-                  :value="
-                    propsData.aspect.sustainability.carbonFootprint
-                      .co2FootprintTotal
-                  "
+                  :icon="callIconFinder('carbon')"
+                  :label="attr.type"
+                  :value="attr.value"
+                  :unit="attr.unit"
                 />
               </template>
-              <template
-                v-if="
-                  propsData.aspect.sustainability.carbonFootprint
-                    .productOrSectorSpecificRules
-                "
-              >
-                <div
-                  v-for="(attr, key) in propsData.aspect.sustainability
-                    .carbonFootprint.productOrSectorSpecificRules"
-                  :key="key"
-                >
-                  <Field
-                    icon="mdi-image-size-select-small"
-                    label="Operator"
-                    :value="attr.operator"
-                  />
-                  <Field
-                    icon="mdi-image-size-select-small"
-                    label="Rule names"
-                    :value="attr.ruleNames"
-                  />
-                  <Field
-                    icon="mdi-image-size-select-small"
-                    label="Other operator name"
-                    :value="attr.otherOperatorName"
-                  />
-                </div>
-              </template>
-            </v-col>
+            </template>
           </template>
-        </v-row>
-      </template>
-      <template v-else>
-        <v-row class="section">
-          <v-col sm="12" md="4" class="pa-0 ma-0">
-            <template v-if="propsData.aspect.sustainability.state">
+          <template v-if="propsData.state">
+            <Field
+              :icon="callIconFinder('Sustainability')"
+              label="State"
+              :value="propsData.state"
+            />
+          </template>
+        </v-col>
+        <v-col sm="12" md="4" class="pa-0 ma-0">
+          <template v-if="propsData.material">
+            <template v-for="attr in propsData.material.left" :key="attr">
               <Field
-                icon="mdi-image-size-select-small"
-                label="State"
-                :value="propsData.aspect.sustainability.state"
+                :icon="callIconFinder('material')"
+                :label="attr.name.type"
+                :value="attr.name.name"
+                :unit="attr.unit"
               />
-            </template>
-            <template v-if="propsData.aspect.sustainability.material">
-              <AttributeField
-                icon="mdi-image-size-select-small"
-                label="Material"
-                :attributes-list="propsData.aspect.sustainability.material"
-              />
-            </template>
-          </v-col>
-          <template v-if="propsData.aspect.sustainability.carbonFootprint">
-            <v-col sm="12" md="4" class="pa-0 ma-0">
-              <template
-                v-if="
-                  propsData.aspect.sustainability.carbonFootprint
-                    .carbonContentTotal
-                "
-              >
-                <Field
-                  icon="mdi-image-size-select-small"
-                  label="Carbon content total"
-                  :value="
-                    propsData.aspect.sustainability.carbonFootprint
-                      .carbonContentTotal
-                  "
-                />
-              </template>
-              <template
-                v-if="
-                  propsData.aspect.sustainability.carbonFootprint
-                    .crossSectoralStandard
-                "
-              >
+              <template v-for="attr in attr.id" :key="attr">
                 <Field
-                  icon="mdi-image-size-select-small"
-                  label="Cross sectoral standard"
-                  :value="
-                    propsData.aspect.sustainability.carbonFootprint
-                      .crossSectoralStandard
-                  "
-                />
-              </template>
-              <template
-                v-if="
-                  propsData.aspect.sustainability.carbonFootprint
-                    .productOrSectorSpecificRules
-                "
-              >
-                <AttributeField
-                  icon="mdi-image-size-select-small"
-                  label="Material"
-                  :attributes-list="
-                    propsData.aspect.sustainability.carbonFootprint
-                      .productOrSectorSpecificRules
-                  "
+                  :icon="callIconFinder('id')"
+                  :label="attr.type"
+                  :value="attr.id"
+                  :unit="attr.unit"
                 />
               </template>
-            </v-col>
+            </template>
+          </template>
+        </v-col>
+        <v-col sm="12" md="4" class="pa-0 ma-0">
+          <template v-if="propsData.critical">
+            <template v-for="attr in propsData.critical.left" :key="attr">
+              <Field
+                :icon="callIconFinder('material')"
+                label="Critical"
+                :value="attr"
+              />
+            </template>
           </template>
-        </v-row>
-      </template>
+        </v-col>
+      </v-row>
     </v-container>
   </div>
 </template>
 
 <script>
 import Field from "../Field.vue";
-import AttributeField from "../AttributeField.vue";
-import InstructionsField from "../InstructionsField.vue";
+import passportUtil from "@/utils/passportUtil.js";
 
 export default {
   name: "SustainabilityComponent",
   components: {
-    AttributeField,
     Field,
-    InstructionsField,
   },
   props: {
     data: {
@@ -268,5 +114,10 @@ export default {
       propsData: this.$props.data,
     };
   },
+  methods: {
+    callIconFinder(unit) {
+      return passportUtil.iconFinder(unit);
+    },
+  },
 };
 </script>
diff --git a/src/components/passport/sections/Typology.vue b/src/components/passport/sections/Typology.vue
index 92228c55f..96ae5ceb7 100644
--- a/src/components/passport/sections/Typology.vue
+++ b/src/components/passport/sections/Typology.vue
@@ -25,27 +25,21 @@
     <v-container class="ma-0">
       <v-row class="section">
         <v-col sm="12" md="4" class="pa-0 ma-0">
-          <DialogComponent class="field-dialog">
-            <Field
-              info
-              icon="mdi-image-size-select-small"
-              label="Name"
-              :value="propsData.name"
-            />
-            <template v-slot:text>
-              {{ propsData.description }}
-            </template>
-          </DialogComponent>
+          <Field
+            :icon="callIconFinder('shortName')"
+            label="Short name"
+            :value="propsData.shortName"
+          />
         </v-col>
         <template v-if="propsData.class">
           <v-col sm="12" md="4" class="pa-0 ma-0">
             <Field
-              icon="mdi-lightning-bolt-outline"
+              :icon="callIconFinder('definition')"
               label="Definition"
               :value="propsData.class.definition"
             />
             <Field
-              icon="mdi-arrow-bottom-right-thin-circle-outline"
+              :icon="callIconFinder('code')"
               label="Code"
               :value="propsData.class.code"
             />
@@ -53,14 +47,9 @@
         </template>
         <v-col sm="12" md="4" class="pa-0 ma-0">
           <Field
-            icon="mdi-lightning-bolt-outline"
-            label="Name at manufacturer"
-            :value="propsData.nameAtManufacturer"
-          />
-          <Field
-            icon="mdi-arrow-bottom-right-thin-circle-outline"
-            label="Name at customer"
-            :value="propsData.nameAtCustomer"
+            :icon="callIconFinder('longName')"
+            label="Long name"
+            :value="propsData.longName"
           />
         </v-col>
       </v-row>
@@ -70,12 +59,11 @@
 
 <script>
 import Field from "../Field.vue";
-import DialogComponent from "../../general/Dialog.vue";
+import passportUtil from "@/utils/passportUtil.js";
 
 export default {
   name: "TypologyComponent",
   components: {
-    DialogComponent,
     Field,
   },
   props: {
@@ -89,5 +77,10 @@ export default {
       propsData: this.$props.data.aspect["typology"],
     };
   },
+  methods: {
+    callIconFinder(unit) {
+      return passportUtil.iconFinder(unit);
+    },
+  },
 };
 </script>
diff --git a/src/config/templates/iconMappings.json b/src/config/templates/iconMappings.json
index c524f6055..1fb7dc2d3 100644
--- a/src/config/templates/iconMappings.json
+++ b/src/config/templates/iconMappings.json
@@ -21,9 +21,11 @@
   "data": "mdi-data-matrix",
   "chemistry": "mdi-react",
   "exchange": "mdi-file-swap-outline",
+  "weight": "mdi-weight",
+  "diameter": "mdi-diameter-outline",
   "torque": "mdi-cog-outline",
   "gear": "mdi-cog-outline",
   "power": "mdi-cog-outline",
   "drive": "mdi-car",
   "oil": "mdi-oil"
-}
\ No newline at end of file
+}
diff --git a/src/config/templates/passports.json b/src/config/templates/passports.json
index 25772d5ad..0648caba4 100644
--- a/src/config/templates/passports.json
+++ b/src/config/templates/passports.json
@@ -1,573 +1,696 @@
-{
-    "urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport": {
-        "serialization": {
-            "manufacturingInformation": {
-                "date": null,
-                "country": null
-            },
-            "registration": {
-                "customerPartId": null,
-                "manufacturerPartId": null
-            },
-            "quantity": {
-                "value": null,
-                "unit": null
-            }
-        },
-        "typology": {
-            "name": null,
-            "description": null,
-            "class": {
-                "definition": null,
-                "code": null
-            },
-            "nameAtManufacturer": null,
-            "nameAtCustomer": null
-        },
-        "metadata": {
-            "issueDate": null,
-            "version": null,
-            "validityDate": null,
-            "economicOperator": {
-                "eori": null,
-                "id": null
-            },
-            "status": null
-        },
-        "characteristics": {
-            "physicalDimensionsProperty": {
-                "width": null,
-                "length": null,
-                "weight": null,
-                "height": null
-            },
-            "energyCapacity": {
-                "value": null,
-                "unit": null
-            },
-            "voltage": {
-                "value": null,
-                "unit": null
-            }
-        },
-        "commercial": {
-            "placedOnMarket": null,
-            "warranty": null
-        },
-        "identification": {
-            "localIdentifiers": [
-                {
-                    "value": null,
-                    "key": null
-                }
-            ],
-            "gtin": null,
-            "additionalCode": [
-                {
-                    "name": null,
-                    "value": null
-                }
-            ]
-        },
-        "sources": {
-            "mandatory": {},
-            "optional": []
-        },
-        "sustainability": {
-            "state": null,
-            "material": [],
-            "critical": null,
-            "carbonFootprint": {
-                "carbonContentTotal": null,
-                "crossSectoralStandard": null,
-                "productOrSectorSpecificRules": [
-                    {
-                        "ruleName": null
-                    }
-                ]
-            }
-        },
-        "operation": {
-            "importer": null,
-            "manufacturer": {
-                "manufacturerId": null,
-                "facilityId": null
-            }
-        }
-    },
-    "urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass": {
-        "electrochemicalProperties": {
-            "ratedCapacity": null,
-            "batteryEnergy": {
-                "energyRoundtripEfficiencyChange": null,
-                "maximumAllowedBatteryEnergy": null,
-                "energyRoundtripEfficiency": null
-            },
-            "ratioMaximumAllowedBatteryPowerAndMaximumAllowedBatteryEnergy": null,
-            "batteryVoltage": {
-                "nominalVoltage": null,
-                "maxVoltage": null,
-                "minVoltage": null
-            },
-            "internalResistance": {
-                "cellInternalResistance": null,
-                "packInternalResistanceIncrease": null,
-                "packInternalResistance": null
-            },
-            "capacityThresholdExhaustion": null,
-            "batteryPower": {
-                "powerFade": null,
-                "originalPowerCapability": null,
-                "originalPowerCapabilityLimits": null,
-                "maximumAllowedBatteryPower": null,
-                "powerCapabilityAt20Charge": null,
-                "powerCapabilityAt80Charge": null
-            },
-            "capacityFade": null
-        },
-        "document": {
-            "responsibleSourcing": [
-                {
-                    "title": null,
-                    "fileLocation": null
-                },
-                {
-                    "title": null,
-                    "fileLocation": null
-                },
-                {
-                    "title": null,
-                    "fileLocation": null
-                },
-                {
-                    "title": null,
-                    "fileLocation": null
-                },
-                {
-                    "title": null,
-                    "fileLocation": null
-                },
-                {
-                    "title": null,
-                    "fileLocation": null
-                },
-                {
-                    "title": null,
-                    "fileLocation": null
-                }
-            ],
-            "packagingInstructions": [
-                {
-                    "title": null,
-                    "fileLocation": null
-                }
-            ],
-            "transportationInstructions": [
-                {
-                    "title": null,
-                    "fileLocation": null
-                }
-            ],
-            "vehicleDismantlingProcedure": [
-                {
-                    "title": null,
-                    "fileLocation": null
-                }
-            ],
-            "testReportsResults": [
-                {
-                    "title": null,
-                    "fileLocation": null
-                }
-            ],
-            "batteryDismantlingProcedure": [
-                {
-                    "title": null,
-                    "fileLocation": null
-                }
-            ],
-            "safetyMeasures": [
-                {
-                    "title": null,
-                    "fileLocation": null
-                }
-            ],
-            "declarationOfConformity": [
-                {
-                    "title": null,
-                    "fileLocation": null
-                }
-            ]
-        },
-        "datePlacedOnMarket": null,
-        "cellChemistry": {
-            "electrolyteComposition": [
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                }
-            ],
-            "anodeCompositionOther": [
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                }
-            ],
-            "recyclateContentActiveMaterials": [
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                }
-            ],
-            "anodeActiveMaterials": [
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                }
-            ],
-            "cathodeActiveMaterials": [
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                },
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                },
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                },
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                }
-            ],
-            "cathodeCompositionOther": [
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                }
-            ]
-        },
-        "physicalDimensions": {
-            "length": null,
-            "width": null,
-            "weight": null,
-            "diameter": null,
-            "height": null
-        },
-        "temperatureRangeIdleState": {
-            "temperatureRangeIdleStateUpperLimit": null,
-            "temperatureRangeIdleStateLowerLimit": null
-        },
-        "batteryCycleLife": {
-            "cycleLifeTestCRate": null,
-            "cycleLifeTestDepthOfDischarge": null,
-            "expectedLifetime": null
-        },
-        "manufacturer": {
-            "name": null,
-            "contact": {
-                "faxNumber": null,
-                "website": null,
-                "phoneNumber": null,
-                "email": null
-            },
-            "address": {
-                "locality": {
-                    "value": null,
-                    "technicalKey": null
-                },
-                "country": {
-                    "shortName": null
-                },
-                "postCode": {
-                    "value": null,
-                    "technicalKey": null
-                },
-                "thoroughfare": {
-                    "value": null,
-                    "number": null,
-                    "technicalKey": null
-                },
-                "premise": {
-                    "value": null,
-                    "technicalKey": null
-                },
-                "postalDeliveryPoint": {
-                    "value": null,
-                    "technicalKey": null
-                }
-            }
-        },
-        "warrantyPeriod": null,
-        "composition": {
-            "compositionOfBattery": [
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                },
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                },
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                },
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                },
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                },
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                },
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                },
-                {
-                    "materialPercentageMassFraction": null,
-                    "materialName": null,
-                    "materialWeight": null
-                }
-            ],
-            "criticalRawMaterials": null,
-            "components": {
-                "componentsPartNumber": [
-                    null
-                ],
-                "componentsSupplier": [
-                    {
-                        "componentsSupplierName": null,
-                        "address": {
-                            "locality": {
-                                "value": null,
-                                "technicalKey": null
-                            },
-                            "country": {
-                                "shortName": null
-                            },
-                            "postCode": {
-                                "value": null,
-                                "technicalKey": null
-                            },
-                            "thoroughfare": {
-                                "value": null,
-                                "number": null,
-                                "technicalKey": null
-                            },
-                            "premise": {
-                                "value": null,
-                                "technicalKey": null
-                            },
-                            "postalDeliveryPoint": {
-                                "value": null,
-                                "technicalKey": null
-                            }
-                        },
-                        "contact": {
-                            "faxNumber": null,
-                            "website": null,
-                            "phoneNumber": null,
-                            "email": null
-                        }
-                    }
-                ]
-            }
-        },
-        "manufacturing": {
-            "dateOfManufacturing": null,
-            "address": {
-                "locality": {
-                    "value": null,
-                    "technicalKey": null
-                },
-                "country": {
-                    "shortName": null
-                },
-                "postCode": {
-                    "value": null,
-                    "technicalKey": null
-                },
-                "thoroughfare": {
-                    "value": null,
-                    "number": null,
-                    "technicalKey": null
-                },
-                "premise": {
-                    "value": null,
-                    "technicalKey": null
-                },
-                "postalDeliveryPoint": {
-                    "value": null,
-                    "technicalKey": null
-                }
-            }
-        },
-        "batteryIdentification": {
-            "batteryType": null,
-            "batteryIDDMCCode": null,
-            "batteryModel": null
-        },
-        "stateOfBattery": {
-            "stateOfHealth": null,
-            "statusBattery": null,
-            "stateOfCharge": null
-        },
-        "cO2FootprintTotal": null
-    },
-    "urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass": {
-        "productSpecificParameters": {
-            "torqueConverter": null,
-            "driveType": null,
-            "oilType": null,
-            "spreading": null,
-            "torque": null,
-            "power": null,
-            "standardGearRatio": {
-                "gear": null,
-                "ratio": null
-            },
-            "oilCapacity": null,
-            "electricPerformance": null,
-            "speedResistance": {
-                "speed": null,
-                "gear": null
-            }
-        },
-        "instructions": {
-            "packagingInstructions": [
-                {
-                    "documentTitle": null,
-                    "documentLink": null
-                }
-            ],
-            "transportationInstructions": [
-                {
-                    "documentTitle": null,
-                    "documentLink": null
-                }
-            ],
-            "dismantlingProcedure": [
-                {
-                    "documentTitle": null,
-                    "documentLink": null
-                }
-            ],
-            "safetyMeasures": [
-                {
-                    "documentTitle": null,
-                    "documentLink": null
-                }
-            ],
-            "vehicleDismantlingProcedure": [
-                {
-                    "documentTitle": null,
-                    "documentLink": null
-                }
-            ]
-        },
-        "identification": {
-            "manufacturerId": null,
-            "localIdentifiers": [
-                {
-                    "value": null,
-                    "key": null
-                }
-            ],
-            "dataMatrixCode": null
-        },
-        "sparePartSupplier": [
-            {
-                "supplierContact": {
-                    "faxNumber": null,
-                    "website": null,
-                    "phoneNumber": null,
-                    "email": null
-                },
-                "supplierId": null,
-                "sparePartName": null
-            }
-        ],
-        "stateOfHealth": {
-            "serviceHistory": null,
-            "expectedLifespan": null,
-            "remanufacturing": {
-                "remanufacturingDate": null,
-                "productStatusValue": null
-            }
-        },
-        "generalInformation": {
-            "additionalInformation": null,
-            "physicalDimensionsProperty": {
-                "width": null,
-                "length": null,
-                "weight": null,
-                "diameter": null,
-                "height": null
-            },
-            "warrantyPeriod": null,
-            "productDescription": null,
-            "productType": null
-        },
-        "sustainability": {
-            "substancesOfConcern": null,
-            "responsibleSourcingDocument": [
-                {
-                    "documentTitle": null,
-                    "documentLink": null
-                }
-            ],
-            "recyclateContent": {
-                "nickel": null,
-                "lithium": null,
-                "cobalt": null,
-                "otherSubstance": [
-                    {
-                        "substancePercentage": null,
-                        "substanceName": null
-                    }
-                ]
-            },
-            "criticalRawMaterials": null,
-            "carbonFootprint": {
-                "crossSectoralStandardsUsed": [
-                    {
-                        "crossSectoralStandard": null
-                    }
-                ],
-                "co2FootprintTotal": null,
-                "productOrSectorSpecificRules": [
-                    {
-                        "operator": null,
-                        "ruleNames": null,
-                        "otherOperatorName": null
-                    }
-                ]
-            }
-        }
-    }
-}
\ No newline at end of file
+{
+  "urn:samm:io.catenax.generic.digital_product_passport:2.0.0#DigitalProductPassport": {
+    "typology": {
+      "shortName": null,
+      "class": {
+        "definition": null,
+        "code": null
+      },
+      "longName": null
+    },
+    "metadata": {
+      "predecessor": null,
+      "issueDate": null,
+      "version": null,
+      "economicOperator": {
+        "legitimization": null,
+        "identification": null
+      },
+      "status": null,
+      "expirationDate": null
+    },
+    "characteristics": {
+      "physicalDimension": {
+        "grossWeight": {
+          "value": null,
+          "unit": null
+        },
+        "weightOrVolume": {
+          "left": {
+            "value": null,
+            "unit": null
+          }
+        },
+        "diameter": {
+          "value": null,
+          "unit": null
+        },
+        "grossVolume": {
+          "value": null,
+          "unit": null
+        },
+        "width": {
+          "value": null,
+          "unit": null
+        },
+        "length": {
+          "value": null,
+          "unit": null
+        },
+        "height": {
+          "value": null,
+          "unit": null
+        }
+      },
+      "lifespan": [
+        {
+          "value": null,
+          "unit": null,
+          "key": null
+        }
+      ],
+      "physicalState": null
+    },
+    "commercial": {
+      "placedOnMarket": null
+    },
+    "identification": {
+      "localIdentifier": {
+        "value": null,
+        "key": null
+      },
+      "additionalCode": [
+        {
+          "value": null,
+          "key": null
+        }
+      ],
+      "dataCarrier": {
+        "carrierType": null,
+        "carrierLayout": null
+      }
+    },
+    "sources": [
+      {
+        "header": null,
+        "category": null,
+        "type": null,
+        "content": null
+      }
+    ],
+    "handling": {
+      "spareParts": {
+        "left": {
+          "producer": [
+            {
+              "id": null
+            }
+          ],
+          "part": [
+            {
+              "name": null,
+              "gtin": null
+            }
+          ]
+        }
+      },
+      "substanceOfConcern": {
+        "left": [
+          {
+            "name": {
+              "name": null,
+              "type": null
+            },
+            "location": null,
+            "unit": null,
+            "concentration": {
+              "left": [
+                {
+                  "max": null,
+                  "min": null
+                }
+              ]
+            },
+            "exemption": null,
+            "id": [
+              {
+                "type": null,
+                "id": null
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "additionalData": [
+      {
+        "description": null,
+        "label": null,
+        "type": {
+          "typeUnit": null,
+          "dataType": null
+        },
+        "data": null,
+        "children": [
+          {
+            "description": null,
+            "label": null,
+            "type": {
+              "typeUnit": null,
+              "dataType": null
+            },
+            "data": null
+          }
+        ]
+      }
+    ],
+    "sustainability": {
+      "PEF": {
+        "carbon": [
+          {
+            "lifecycle": null,
+            "rulebook": null,
+            "unit": null,
+            "type": null,
+            "value": null
+          }
+        ],
+        "carbon2": {
+          "lifecycle": null,
+          "rulebook": null,
+          "unit": null,
+          "type": null,
+          "value": null
+        },
+        "environmental": [
+          {
+            "lifecycle": null,
+            "rulebook": null,
+            "unit": null,
+            "type": null,
+            "value": null
+          }
+        ]
+      },
+      "state": null,
+      "material": {
+        "left": [
+          {
+            "name": {
+              "name": null,
+              "type": null
+            },
+            "unit": null,
+            "recycled": null,
+            "id": [
+              {
+                "type": null,
+                "id": null
+              }
+            ],
+            "value": null,
+            "renewable": null
+          }
+        ]
+      },
+      "critical": {
+        "left": [
+          null
+        ]
+      }
+    },
+    "operation": {
+      "importer": {
+        "left": {
+          "eori": null,
+          "id": null
+        }
+      },
+      "manufacturer": {
+        "facility": null,
+        "manufacturingDate": null,
+        "manufacturer": null
+      }
+    }
+  },
+  "urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport": {
+    "serialization": {
+      "manufacturingInformation": {
+        "date": null,
+        "country": null
+      },
+      "registration": {
+        "customerPartId": null,
+        "manufacturerPartId": null
+      },
+      "quantity": {
+        "value": null,
+        "unit": null
+      }
+    },
+    "typology": {
+      "name": null,
+      "description": null,
+      "class": {
+        "definition": null,
+        "code": null
+      },
+      "nameAtManufacturer": null,
+      "nameAtCustomer": null
+    },
+    "metadata": {
+      "issueDate": null,
+      "version": null,
+      "validityDate": null,
+      "economicOperator": {
+        "eori": null,
+        "id": null
+      },
+      "status": null
+    },
+    "characteristics": {
+      "physicalDimensionsProperty": {
+        "width": null,
+        "length": null,
+        "weight": null,
+        "height": null
+      },
+      "energyCapacity": {
+        "value": null,
+        "unit": null
+      },
+      "voltage": {
+        "value": null,
+        "unit": null
+      }
+    },
+    "commercial": {
+      "placedOnMarket": null,
+      "warranty": null
+    },
+    "identification": {
+      "localIdentifiers": [
+        {
+          "value": null,
+          "key": null
+        }
+      ],
+      "gtin": null,
+      "additionalCode": [
+        {
+          "name": null,
+          "value": null
+        }
+      ]
+    },
+    "sources": {
+      "mandatory": {
+        "safetyInformation": {
+          "header": null,
+          "category": null,
+          "type": null,
+          "content": null
+        },
+        "environmentalImpact": {
+          "header": null,
+          "category": null,
+          "type": null,
+          "content": null
+        }
+      },
+      "optional": [
+        {
+          "name": null,
+          "document": {
+            "header": null,
+            "category": null,
+            "type": null,
+            "content": null
+          }
+        }
+      ]
+    },
+    "sustainability": {
+      "state": null,
+      "material": [
+        {
+          "name": null,
+          "recycled": false,
+          "renewable": false,
+          "percentage": null
+        }
+      ],
+      "critical": null,
+      "carbonFootprint": {
+        "carbonContentTotal": null,
+        "crossSectoralStandard": null,
+        "productOrSectorSpecificRules": [
+          {
+            "ruleName": null
+          }
+        ]
+      }
+    },
+    "operation": {
+      "importer": null,
+      "manufacturer": {
+        "manufacturerId": null,
+        "facilityId": null
+      }
+    }
+  },
+  "urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass": {
+    "electrochemicalProperties": {
+      "ratedCapacity": null,
+      "batteryEnergy": {
+        "energyRoundtripEfficiencyChange": null,
+        "maximumAllowedBatteryEnergy": null,
+        "energyRoundtripEfficiency": null
+      },
+      "ratioMaximumAllowedBatteryPowerAndMaximumAllowedBatteryEnergy": null,
+      "batteryVoltage": {
+        "nominalVoltage": null,
+        "maxVoltage": null,
+        "minVoltage": null
+      },
+      "internalResistance": {
+        "cellInternalResistance": null,
+        "packInternalResistanceIncrease": null,
+        "packInternalResistance": null
+      },
+      "capacityThresholdExhaustion": null,
+      "batteryPower": {
+        "powerFade": null,
+        "originalPowerCapability": null,
+        "originalPowerCapabilityLimits": null,
+        "maximumAllowedBatteryPower": null,
+        "powerCapabilityAt20Charge": null,
+        "powerCapabilityAt80Charge": null
+      },
+      "capacityFade": null
+    },
+    "document": {
+      "responsibleSourcing": [
+        {
+          "title": null,
+          "fileLocation": null
+        },
+        {
+          "title": null,
+          "fileLocation": null
+        },
+        {
+          "title": null,
+          "fileLocation": null
+        },
+        {
+          "title": null,
+          "fileLocation": null
+        },
+        {
+          "title": null,
+          "fileLocation": null
+        },
+        {
+          "title": null,
+          "fileLocation": null
+        },
+        {
+          "title": null,
+          "fileLocation": null
+        }
+      ],
+      "packagingInstructions": [
+        {
+          "title": null,
+          "fileLocation": null
+        }
+      ],
+      "transportationInstructions": [
+        {
+          "title": null,
+          "fileLocation": null
+        }
+      ],
+      "vehicleDismantlingProcedure": [
+        {
+          "title": null,
+          "fileLocation": null
+        }
+      ],
+      "testReportsResults": [
+        {
+          "title": null,
+          "fileLocation": null
+        }
+      ],
+      "batteryDismantlingProcedure": [
+        {
+          "title": null,
+          "fileLocation": null
+        }
+      ],
+      "safetyMeasures": [
+        {
+          "title": null,
+          "fileLocation": null
+        }
+      ],
+      "declarationOfConformity": [
+        {
+          "title": null,
+          "fileLocation": null
+        }
+      ]
+    },
+    "datePlacedOnMarket": null,
+    "cellChemistry": {
+      "electrolyteComposition": [
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        }
+      ],
+      "anodeCompositionOther": [
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        }
+      ],
+      "recyclateContentActiveMaterials": [
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        }
+      ],
+      "anodeActiveMaterials": [
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        }
+      ],
+      "cathodeActiveMaterials": [
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        },
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        },
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        },
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        }
+      ],
+      "cathodeCompositionOther": [
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        }
+      ]
+    },
+    "physicalDimensions": {
+      "length": null,
+      "width": null,
+      "weight": null,
+      "diameter": null,
+      "height": null
+    },
+    "temperatureRangeIdleState": {
+      "temperatureRangeIdleStateUpperLimit": null,
+      "temperatureRangeIdleStateLowerLimit": null
+    },
+    "batteryCycleLife": {
+      "cycleLifeTestCRate": null,
+      "cycleLifeTestDepthOfDischarge": null,
+      "expectedLifetime": null
+    },
+    "manufacturer": {
+      "name": null,
+      "contact": {
+        "faxNumber": null,
+        "website": null,
+        "phoneNumber": null,
+        "email": null
+      },
+      "address": {
+        "locality": {
+          "value": null,
+          "technicalKey": null
+        },
+        "country": {
+          "shortName": null
+        },
+        "postCode": {
+          "value": null,
+          "technicalKey": null
+        },
+        "thoroughfare": {
+          "value": null,
+          "number": null,
+          "technicalKey": null
+        },
+        "premise": {
+          "value": null,
+          "technicalKey": null
+        },
+        "postalDeliveryPoint": {
+          "value": null,
+          "technicalKey": null
+        }
+      }
+    },
+    "warrantyPeriod": null,
+    "composition": {
+      "compositionOfBattery": [
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        },
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        },
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        },
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        },
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        },
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        },
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        },
+        {
+          "materialPercentageMassFraction": null,
+          "materialName": null,
+          "materialWeight": null
+        }
+      ],
+      "criticalRawMaterials": null,
+      "components": {
+        "componentsPartNumber": [
+          null
+        ],
+        "componentsSupplier": [
+          {
+            "componentsSupplierName": null,
+            "address": {
+              "locality": {
+                "value": null,
+                "technicalKey": null
+              },
+              "country": {
+                "shortName": null
+              },
+              "postCode": {
+                "value": null,
+                "technicalKey": null
+              },
+              "thoroughfare": {
+                "value": null,
+                "number": null,
+                "technicalKey": null
+              },
+              "premise": {
+                "value": null,
+                "technicalKey": null
+              },
+              "postalDeliveryPoint": {
+                "value": null,
+                "technicalKey": null
+              }
+            },
+            "contact": {
+              "faxNumber": null,
+              "website": null,
+              "phoneNumber": null,
+              "email": null
+            }
+          }
+        ]
+      }
+    },
+    "manufacturing": {
+      "dateOfManufacturing": null,
+      "address": {
+        "locality": {
+          "value": null,
+          "technicalKey": null
+        },
+        "country": {
+          "shortName": null
+        },
+        "postCode": {
+          "value": null,
+          "technicalKey": null
+        },
+        "thoroughfare": {
+          "value": null,
+          "number": null,
+          "technicalKey": null
+        },
+        "premise": {
+          "value": null,
+          "technicalKey": null
+        },
+        "postalDeliveryPoint": {
+          "value": null,
+          "technicalKey": null
+        }
+      }
+    },
+    "batteryIdentification": {
+      "batteryType": null,
+      "batteryIDDMCCode": null,
+      "batteryModel": null
+    },
+    "stateOfBattery": {
+      "stateOfHealth": null,
+      "statusBattery": null,
+      "stateOfCharge": null
+    },
+    "cO2FootprintTotal": null
+  }
+}