diff --git a/docs/openapi/components/schemas/common/PostalAddress.yml b/docs/openapi/components/schemas/common/PostalAddress.yml
index f2d4ef7e8..972a5a828 100644
--- a/docs/openapi/components/schemas/common/PostalAddress.yml
+++ b/docs/openapi/components/schemas/common/PostalAddress.yml
@@ -95,6 +95,13 @@ properties:
     $linkedData:
       term: postOfficeBoxNumber
       '@id': https://schema.org/postOfficeBoxNumber
+  plantOrSiteName:
+    title: Plant or Site Name
+    description: Name of Plant, Site or Unit.
+    type: string
+    $linkedData:
+      term: plantOrSiteName
+      '@id': https://vocabulary.uncefact.org/buildingName
 additionalProperties: false
 required:
   - type
diff --git a/docs/openapi/components/schemas/credentials/MillTestReportCredential.yml b/docs/openapi/components/schemas/credentials/MillTestReportCredential.yml
index 093e6fbf8..da9610e69 100644
--- a/docs/openapi/components/schemas/credentials/MillTestReportCredential.yml
+++ b/docs/openapi/components/schemas/credentials/MillTestReportCredential.yml
@@ -163,6 +163,37 @@ properties:
     description: Test results made by a manufacturer of a metal product.
     type: object
     properties:
+      certificateNumber:
+        title: Certificate Number
+        description: Mill test report certificate number.
+        type: string
+      certification:
+        title: Certification
+        description: The type of certification conducted. 
+        type: string
+      purchaseOrderNumber:
+        title: Purchase Order Number
+        description: Purchase order number. 
+        type: string
+      shipmentDate: 
+        title: Shipment Date
+        description: Date of shipping.
+        type: string
+        format: date
+        $linkedData:
+          term: shipmentDate
+          '@id': https://vocabulary.uncefact.org/DateTimePeriodFunctionCodeList#270
+      meansOfTransport: 
+        title: Means of Transport
+        description: A means of transport, expressed as text, for this transport route.
+        type: string
+        enum: 
+          - Road
+          - Rail
+          - Ocean
+        $linkedData:
+          term: meansOfTransport
+          '@id': https://vocabulary.uncefact.org/transportMeans
       customer:
         title: Customer
         description: Bill to, buyer party. 
@@ -220,6 +251,10 @@ properties:
                       type: string
                       enum:
                         - PostalAddress
+                  plantOrSiteName:
+                    title: Plant or Site Name
+                    description: Name of Plant, Site or Unit.
+                    type: string
                   streetAddress:
                     title: Street Address
                     description: >-
@@ -317,6 +352,10 @@ properties:
                       type: string
                       enum:
                         - PostalAddress
+                  plantOrSiteName:
+                    title: Plant or Site Name
+                    description: Name of Plant, Site or Unit.
+                    type: string
                   streetAddress:
                     title: Street Address
                     description: >-
@@ -350,18 +389,6 @@ properties:
                 additionalProperties: false
             additionalProperties: false
         additionalProperties: false
-      certificateNumber:
-        title: Certificate Number
-        description: Mill test report certificate number.
-        type: string
-      certification:
-        title: Certification
-        description: The type of certification conducted. 
-        type: string
-      purchaseOrderNumber:
-        title: Purchase Order Number
-        description: Purchase order number. 
-        type: string
       productSpecification:
         title: Product Specification
         description: Specifications of product.
@@ -738,7 +765,7 @@ properties:
                     "@id": https://w3id.org/traceability#sn
                 nbCb:
                   title: NbCb
-                  description: Niobium (Columbium) percentage content.
+                  description: Niobium (also known as Columbium) percentage content.
                   type: number
                   $linkedData:
                     term: nbCb
@@ -1072,6 +1099,10 @@ example: |-
     },
     "issuanceDate": "2022-06-06T08:10:00+00:00",
     "credentialSubject": {
+      "certificateNumber": "202304215088",
+      "certification": "EN 10204.3.1",
+      "purchaseOrderNumber": "PO992765413",
+      "meansOfTransport": "Road",
       "customer": {
         "type": [
           "Organization"
@@ -1116,9 +1147,6 @@ example: |-
           }
         }
       },
-      "certificateNumber": "202304215088",
-      "certification": "EN 10204.3.1",
-      "purchaseOrderNumber": "PO992765413",
       "productSpecification": {
         "type": [
           "SteelProduct"