diff --git a/contexts/w3c-ccg-traceability-v1.jsonld b/contexts/w3c-ccg-traceability-v1.jsonld
index 882a99835..10b6bd3f1 100644
--- a/contexts/w3c-ccg-traceability-v1.jsonld
+++ b/contexts/w3c-ccg-traceability-v1.jsonld
@@ -19,7 +19,7 @@
       },
       "@id": "https://w3id.org/traceability#AdditionalProductCodeRegistrationCredential"
     },
-    "AgActivity": {
+    "AgricultureActivity": {
       "@context": {
         "activityDate": {
           "@id": "https://schema.org/DateTime"
@@ -30,7 +30,7 @@
         "actor": {
           "@id": "https://w3id.org/traceability#Person"
         },
-        "agProduct": {
+        "agricultureProduct": {
           "@id": "https://schema.org/ItemList"
         },
         "business": {
@@ -43,9 +43,9 @@
           "@id": "https://w3id.org/traceability#observation"
         }
       },
-      "@id": "https://w3id.org/traceability#AgActivity"
+      "@id": "https://w3id.org/traceability#AgricultureActivity"
     },
-    "AgInspectionReport": {
+    "AgricultureInspectionReport": {
       "@context": {
         "applicant": {
           "@id": "https://w3id.org/traceability#dfn-entities"
@@ -81,11 +81,11 @@
           "@id": "https://www.schema.org/status"
         }
       },
-      "@id": "https://w3id.org/traceability#AgInspectionReport"
+      "@id": "https://w3id.org/traceability#AgricultureInspectionReport"
     },
-    "AgPackage": {
+    "AgriculturePackage": {
       "@context": {
-        "agProduct": {
+        "agricultureProduct": {
           "@id": "https://schema.org/ItemList"
         },
         "date": {
@@ -95,7 +95,7 @@
           "@id": "https://w3id.org/traceability#grade"
         },
         "harvest": {
-          "@id": "https://w3id.org/traceability#AgActivity"
+          "@id": "https://w3id.org/traceability#AgricultureActivity"
         },
         "labelImageHash": {
           "@id": "https://w3id.org/traceability#labelImageHash"
@@ -113,12 +113,12 @@
           "@id": "https://w3id.org/traceability#voicePickCode"
         }
       },
-      "@id": "https://w3id.org/traceability#AgPackage"
+      "@id": "https://w3id.org/traceability#AgriculturePackage"
     },
-    "AgParcelDelivery": {
+    "AgricultureParcelDelivery": {
       "@context": {
-        "AgPackage": {
-          "@id": "https://w3id.org/traceability#AgPackage"
+        "agriculturePackage": {
+          "@id": "https://w3id.org/traceability#AgriculturePackage"
         },
         "broker": {
           "@id": "https://schema.org/Organization"
@@ -163,9 +163,9 @@
           "@id": "https://schema.org/trackingNumber"
         }
       },
-      "@id": "https://w3id.org/traceability#AgParcelDelivery"
+      "@id": "https://w3id.org/traceability#AgricultureParcelDelivery"
     },
-    "AgProduct": {
+    "AgricultureProduct": {
       "@context": {
         "gtin": {
           "@id": "https://www.gs1.org/voc/gtin"
@@ -198,7 +198,7 @@
           "@id": "https://www.gs1.org/standards/barcodes/ean-upc"
         }
       },
-      "@id": "https://w3id.org/traceability#AgProduct"
+      "@id": "https://w3id.org/traceability#AgricultureProduct"
     },
     "BillOfLading": {
       "@context": {
@@ -232,9 +232,12 @@
         "notify": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#notifyParty"
         },
-        "placeOfIssue": {
+        "portOfDischarge": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncl3227/#Place_of_discharge"
         },
+        "portOfLoading": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncl3227/#Place_of_loading"
+        },
         "relatedDocuments": {
           "@id": "https://schema.org/Purchase"
         },
@@ -318,11 +321,14 @@
           "@id": "https://schema.org/weight"
         },
         "commodity": {
-          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#originCountry"
+          "@id": "https://w3id.org/traceability#Commodity"
         },
         "commodityItemNumber": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#discountIndicator"
         },
+        "countryOfOrigin": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#originCountry"
+        },
         "descriptionOfPackagesAndGoods": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#natureIdentificationCargo"
         },
@@ -374,7 +380,7 @@
         "total": {
           "@id": "https://schema.org/totalPrice"
         },
-        "transportPackage": {
+        "transportPackages": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#Package"
         },
         "volume": {
@@ -501,9 +507,6 @@
     },
     "ContactPoint": {
       "@context": {
-        "address": {
-          "@id": "https://schema.org/PostalAddress"
-        },
         "email": {
           "@id": "https://schema.org/email"
         },
@@ -512,6 +515,9 @@
         },
         "phoneNumber": {
           "@id": "https://schema.org/telephone"
+        },
+        "place": {
+          "@id": "https://w3id.org/traceability#place"
         }
       },
       "@id": "https://schema.org/ContactPoint"
@@ -578,6 +584,9 @@
         "description": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#description"
         },
+        "firstNotify": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#notifyParty"
+        },
         "invoicePayableAt": {
           "@id": "https://api.swaggerhub.com/domains/dcsaorg/DCSA_DOMAIN/1.0.1#/components/schemas/invoicePayableAt"
         },
@@ -587,12 +596,15 @@
         "invoicePayerShipper": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#shipperParty"
         },
-        "notify": {
+        "otherNotify": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#notifyParty"
         },
         "preCarriageUnderShippersResponsibility": {
           "@id": "https://api.swaggerhub.com/domains/dcsaorg/DCSA_DOMAIN/1.0.1#/components/schemas/preCarriageUnderShippersResponsibility"
         },
+        "secondNotify": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#notifyParty"
+        },
         "shipmentLocations": {
           "@id": "https://api.swaggerhub.com/domains/dcsaorg/DOCUMENTATION_DOMAIN/1.0.0#/components/schemas/shipmentLocation"
         },
@@ -683,6 +695,62 @@
       },
       "@id": "https://w3id.org/traceability#DCSATransportDocumentCertificate"
     },
+    "DeMinimisShipmentCertificate": {
+      "@context": {
+        "buyer": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#buyerParty"
+        },
+        "enhancedProductDescription": {
+          "@id": "https://w3id.org/traceability#enhancedProductDescription"
+        },
+        "houseBillOfLadingNumber": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncl1153/#House_bill_of_lading_number"
+        },
+        "knownCarrierCustomerFlag": {
+          "@id": "https://w3id.org/traceability#knownCarrierCustomerFlag"
+        },
+        "knownMarketplaceSellerFlag": {
+          "@id": "https://w3id.org/traceability#knownMarketplaceSellerFlag"
+        },
+        "listedPriceOnMarketplace": {
+          "@id": "https://schema.org/price"
+        },
+        "marketplaceSellerAccountNumber": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncl1153/#Account_number"
+        },
+        "masterBillOfLadingNumber": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncl1153/#Bill_of_lading_number"
+        },
+        "modeOfTransportation": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#mode"
+        },
+        "originatorCode": {
+          "@id": "https://w3id.org/traceability#originatorCode"
+        },
+        "participantFilerType": {
+          "@id": "https://w3id.org/traceability#participantFilerType"
+        },
+        "productPicture": {
+          "@id": "https://schema.org/image"
+        },
+        "seller": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#sellerParty"
+        },
+        "shipToParty": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#shipToParty"
+        },
+        "shipmentInitiator": {
+          "@id": "https://w3id.org/traceability#shipmentInitiator"
+        },
+        "shipmentSecurityScan": {
+          "@id": "https://w3id.org/traceability#shipmentSecurityScan"
+        },
+        "shipmentTrackingNumber": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#shipmentIdentificationId"
+        }
+      },
+      "@id": "https://w3id.org/traceability#DeMinimisExemptionCertificate"
+    },
     "DocumentVerificationEvidence": {
       "@context": {
         "documentPresence": {
@@ -705,6 +773,9 @@
         "email": {
           "@id": "https://schema.org/email"
         },
+        "entityType": {
+          "@id": "https://schema.org/additionalType"
+        },
         "legalName": {
           "@id": "https://schema.org/legalName"
         },
@@ -881,6 +952,361 @@
       },
       "@id": "https://schema.org/Event"
     },
+    "FSMAAbstractKDE": {
+      "@context": {
+        "name": {
+          "@id": "https://schema.org/propertyID"
+        },
+        "value": {
+          "@id": "https://schema.org/value"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FSMAAbstractKDE"
+    },
+    "FSMACreatingCTE": {
+      "@context": {
+        "additionalData": {
+          "@id": "https://w3id.org/traceability#FSMAAbstractKDE"
+        },
+        "dateCompleted": {
+          "@id": "https://schema.org/endDate"
+        },
+        "food": {
+          "@id": "https://w3id.org/traceability#FSMAProduct"
+        },
+        "location": {
+          "@id": "https://schema.org/location"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FSMACreatingCTE"
+    },
+    "FSMACreatingCTECertificate": {
+      "@context": {
+      },
+      "@id": "https://w3id.org/traceability#FSMACreatingCTECertificate"
+    },
+    "FSMAFirstReceiverCTE": {
+      "@context": {
+        "additionalData": {
+          "@id": "https://w3id.org/traceability#FSMAAbstractKDE"
+        },
+        "coolingDate": {
+          "@id": "https://schema.org/endDate"
+        },
+        "coolingLocation": {
+          "@id": "https://schema.org/location"
+        },
+        "harvestDate": {
+          "@id": "https://schema.org/endDate"
+        },
+        "originatorLocation": {
+          "@id": "https://schema.org/location"
+        },
+        "packingDate": {
+          "@id": "https://schema.org/endDate"
+        },
+        "packingLocation": {
+          "@id": "https://schema.org/location"
+        },
+        "traceabilityLot": {
+          "@id": "https://w3id.org/traceability#FSMATraceabilityLot"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FSMAFirstReceiverCTE"
+    },
+    "FSMAFirstReceiverDataCertificate": {
+      "@context": {
+      },
+      "@id": "https://w3id.org/traceability#FSMAFirstReceiverDataCertificate"
+    },
+    "FSMAGrowingCTE": {
+      "@context": {
+        "additionalData": {
+          "@id": "https://w3id.org/traceability#FSMAAbstractKDE"
+        },
+        "growingAreaCoordinates": {
+          "@id": "https://w3id.org/traceability#GeoCoordinates"
+        },
+        "traceabilityLot": {
+          "@id": "https://w3id.org/traceability#FSMATraceabilityLot"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FSMAGrowingCTE"
+    },
+    "FSMAGrowingCTECertificate": {
+      "@context": {
+      },
+      "@id": "https://w3id.org/traceability#FSMAGrowingCTECertificate"
+    },
+    "FSMAProduct": {
+      "@context": {
+        "additionalData": {
+          "@id": "https://w3id.org/traceability#FSMAAbstractKDE"
+        },
+        "quantity": {
+          "@id": "https://schema.org/value"
+        },
+        "traceabilityLot": {
+          "@id": "https://w3id.org/traceability#FSMATraceabilityLot"
+        },
+        "unit": {
+          "@id": "https://schema.org/unitText"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FSMAProduct"
+    },
+    "FSMAReceivingCTE": {
+      "@context": {
+        "additionalData": {
+          "@id": "https://w3id.org/traceability#FSMAAbstractKDE"
+        },
+        "dateReceived": {
+          "@id": "https://schema.org/endDate"
+        },
+        "shipment": {
+          "@id": "https://w3id.org/traceability#FSMAShipment"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FSMAReceivingCTE"
+    },
+    "FSMAReceivingCTECertificate": {
+      "@context": {
+      },
+      "@id": "https://w3id.org/traceability#FSMAReceivingCTECertificate"
+    },
+    "FSMAShipment": {
+      "@context": {
+        "additionalData": {
+          "@id": "https://w3id.org/traceability#FSMAAbstractKDE"
+        },
+        "from": {
+          "@id": "https://schema.org/fromLocation"
+        },
+        "product": {
+          "@id": "https://w3id.org/traceability#FSMAProduct"
+        },
+        "to": {
+          "@id": "https://schema.org/toLocation"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FSMAShipment"
+    },
+    "FSMAShippingCTE": {
+      "@context": {
+        "dateShipped": {
+          "@id": "https://schema.org/startDate"
+        },
+        "shipment": {
+          "@id": "https://w3id.org/traceability#FSMAShipment"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FSMAShippingCTE"
+    },
+    "FSMAShippingCTECertificate": {
+      "@context": {
+      },
+      "@id": "https://w3id.org/traceability#FSMAShippingCTECertificate"
+    },
+    "FSMATraceabilityLot": {
+      "@context": {
+        "additionalData": {
+          "@id": "https://w3id.org/traceability#FSMAAbstractKDE"
+        },
+        "lotCode": {
+          "@id": "https://www.gs1.org/voc/hasBatchLotNumber"
+        },
+        "lotCodeAssignmentMethod": {
+          "@id": "https://schema.org/description"
+        },
+        "lotCodeGeneratorLocation": {
+          "@id": "https://schema.org/location"
+        },
+        "lotCodeGeneratorPOC": {
+          "@id": "https://schema.org/contactPoint"
+        },
+        "lotType": {
+          "@id": "https://schema.org/additionalType"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FSMATraceabilityLot"
+    },
+    "FSMATransformingCTE": {
+      "@context": {
+        "additionalData": {
+          "@id": "https://w3id.org/traceability#FSMAAbstractKDE"
+        },
+        "dateCompleted": {
+          "@id": "https://schema.org/endDate"
+        },
+        "foodProduced": {
+          "@id": "https://w3id.org/traceability#FSMAProduct"
+        },
+        "foodUsed": {
+          "@id": "https://w3id.org/traceability#FSMAProduct"
+        },
+        "locationTransformed": {
+          "@id": "https://schema.org/location"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FSMATransformingCTE"
+    },
+    "FSMATransformingCTECertificate": {
+      "@context": {
+      },
+      "@id": "https://w3id.org/traceability#FSMATransformingCTECertificate"
+    },
+    "FoodGradeInspection": {
+      "@context": {
+        "applicant": {
+          "@id": "https://w3id.org/traceability#dfn-entities"
+        },
+        "carrierTypeName": {
+          "@id": "https://schema.org/additionalType"
+        },
+        "delegateOf": {
+          "@id": "https://schema.org/Organization"
+        },
+        "doorsOpen": {
+          "@id": "https://w3id.org/traceability#doorsOpen"
+        },
+        "estimatedCharges": {
+          "@id": "https://schema.org/totalPrice"
+        },
+        "facility": {
+          "@id": "https://www.gs1.org/voc/Place"
+        },
+        "generalRemarks": {
+          "@id": "https://schema.org/description"
+        },
+        "inspectionEnded": {
+          "@id": "https://schema.org/DateTime"
+        },
+        "inspectionStarted": {
+          "@id": "https://schema.org/DateTime"
+        },
+        "inspector": {
+          "@id": "https://w3id.org/traceability#Inspector"
+        },
+        "loadingStatus": {
+          "@id": "https://w3id.org/traceability#loadingStatus"
+        },
+        "lot": {
+          "@id": "https://w3id.org/traceability#FoodGradeInspectionLot"
+        },
+        "refrigerationUnitOn": {
+          "@id": "https://w3id.org/traceability#refrigerationUnitOn"
+        },
+        "regulatoryAgency": {
+          "@id": "https://schema.org/Organization"
+        },
+        "shipment": {
+          "@id": "https://schema.org/ParcelDelivery"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FoodGradeInspection"
+    },
+    "FoodGradeInspectionCertificate": {
+      "@context": {
+      },
+      "@id": "https://w3id.org/traceability#FoodGradeInspectionCertificate"
+    },
+    "FoodGradeInspectionDefect": {
+      "@context": {
+        "averageDefects": {
+          "@id": "https://qudt.org/vocab/unit/PERCENT"
+        },
+        "damage": {
+          "@id": "https://qudt.org/vocab/unit/PERCENT"
+        },
+        "offsizeDefect": {
+          "@id": "https://schema.org/description"
+        },
+        "seriousDamage": {
+          "@id": "https://qudt.org/vocab/unit/PERCENT"
+        },
+        "verySeriousDamage": {
+          "@id": "https://qudt.org/vocab/unit/PERCENT"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FoodGradeInspectionDefect"
+    },
+    "FoodGradeInspectionLot": {
+      "@context": {
+        "agricultureProduct": {
+          "@id": "https://w3id.org/traceability#AgricultureProduct"
+        },
+        "brandMarkings": {
+          "@id": "https://schema.org/description"
+        },
+        "countInspected": {
+          "@id": "https://w3id.org/traceability#countInspected"
+        },
+        "defect": {
+          "@id": "https://w3id.org/traceability#FoodGradeInspectionDefect"
+        },
+        "grade": {
+          "@id": "https://w3id.org/traceability#FoodGradeInspectionResult"
+        },
+        "lotIdentifier": {
+          "@id": "https://www.gs1.org/voc/hasBatchLotNumber"
+        },
+        "maxTemperature": {
+          "@id": "https://schema.org/measuredValue"
+        },
+        "minTemperature": {
+          "@id": "https://schema.org/measuredValue"
+        },
+        "numberContainers": {
+          "@id": "https://schema.org/Integer"
+        },
+        "remarks": {
+          "@id": "https://schema.org/description"
+        },
+        "sample": {
+          "@id": "https://w3id.org/traceability#FoodGradeInspectionSample"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FoodGradeInspectionLot"
+    },
+    "FoodGradeInspectionResult": {
+      "@context": {
+        "details": {
+          "@id": "https://schema.org/description"
+        },
+        "gradeInspected": {
+          "@id": "https://w3id.org/traceability#gradeInspected"
+        },
+        "requirementsMet": {
+          "@id": "https://w3id.org/traceability#requirementsMet"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FoodGradeInspectionResult"
+    },
+    "FoodGradeInspectionSample": {
+      "@context": {
+        "sampleProperty": {
+          "@id": "https://w3id.org/traceability#FoodGradeInspectionSampleProperty"
+        },
+        "sampleSizeUnit": {
+          "@id": "https://schema.org/unitText"
+        },
+        "sampleSizeValue": {
+          "@id": "https://schema.org/value"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FoodGradeInspectionSample"
+    },
+    "FoodGradeInspectionSampleProperty": {
+      "@context": {
+        "propertyName": {
+          "@id": "https://schema.org/name"
+        },
+        "propertyValue": {
+          "@id": "https://schema.org/description"
+        }
+      },
+      "@id": "https://w3id.org/traceability#FoodGradeInspectionSampleProperty"
+    },
     "ForeignChargeDeclaration": {
       "@context": {
         "foreignCharges": {
@@ -1384,8 +1810,14 @@
         "comment": {
           "@id": "https://schema.org/comment"
         },
+        "inspectors": {
+          "@id": "https://schema.org/Person"
+        },
         "observation": {
           "@id": "https://schema.org/ItemList"
+        },
+        "place": {
+          "@id": "https://schema.org/Place"
         }
       },
       "@id": "https://w3id.org/traceability#InspectionReport"
@@ -1401,25 +1833,30 @@
       },
       "@id": "https://w3id.org/traceability#Inspector"
     },
-    "IntentToSell": {
+    "IntentToImport": {
       "@context": {
         "declarationDate": {
-          "@id": "https://schema.org/DateTime"
+          "@id": "https://schema.org/startDate"
         },
         "product": {
           "@id": "https://www.gs1.org/voc/Product"
         },
         "purchaser": {
-          "@id": "https://w3id.org/traceability#Entity"
+          "@id": "https://gs1.org/voc/OrganizationRoleType-BUYER"
         },
         "sellByDate": {
-          "@id": "https://schema.org/DateTime"
+          "@id": "https://gs1.org/voc/sellByDate"
         },
         "seller": {
-          "@id": "https://w3id.org/traceability#Entity"
+          "@id": "https://gs1.org/voc/OrganizationRoleType-SELLER"
         }
       },
-      "@id": "https://w3id.org/traceability#IntentToSell"
+      "@id": "https://w3id.org/traceability#IntentToImport"
+    },
+    "IntentToImportCertificate": {
+      "@context": {
+      },
+      "@id": "https://w3id.org/traceability#IntentToImportCertificate"
     },
     "Invoice": {
       "@context": {
@@ -1501,6 +1938,9 @@
         "totalPaymentDue": {
           "@id": "https://schema.org/totalPaymentDue"
         },
+        "totalWeight": {
+          "@id": "https://schema.org/weight"
+        },
         "weight": {
           "@id": "https://schema.org/weight"
         }
@@ -1849,7 +2289,7 @@
       },
       "@id": "https://w3id.org/traceability#MechanicalProperty"
     },
-    "MillTestReport": {
+    "MillTestReportCertificate": {
       "@context": {
         "manufacturer": {
           "@id": "https://schema.org/Organization"
@@ -1857,18 +2297,10 @@
         "product": {
           "@id": "https://w3id.org/traceability#SteelProduct"
         },
-        "purchase": {
-          "@id": "https://w3id.org/traceability#Purchase"
-        },
-        "shipment": {
-          "@id": "https://schema.org/ParcelDelivery"
+        "rawMaterial": {
+          "@id": "https://w3id.org/traceability#rawMaterial"
         }
       },
-      "@id": "https://w3id.org/traceability#MillTestReport"
-    },
-    "MillTestReportCertificate": {
-      "@context": {
-      },
       "@id": "https://w3id.org/traceability#MillTestReportCertificate"
     },
     "MultiModalBillOfLading": {
@@ -2128,6 +2560,9 @@
         "leiCode": {
           "@id": "https://schema.org/leiCode"
         },
+        "location": {
+          "@id": "https://schema.org/location"
+        },
         "name": {
           "@id": "https://schema.org/name"
         },
@@ -2150,6 +2585,33 @@
     },
     "PGAStatusMessage": {
       "@context": {
+        "entryLineSequence": {
+          "@id": "https://w3id.org/traceability#entryLineSequence"
+        },
+        "entryNo": {
+          "@id": "https://w3id.org/traceability#entryNo"
+        },
+        "recordNo": {
+          "@id": "https://w3id.org/traceability#recordNo"
+        },
+        "statusCode": {
+          "@id": "https://w3id.org/traceability#statusCode"
+        },
+        "statusCodeDescription": {
+          "@id": "https://w3id.org/traceability#statusCodeDescription"
+        },
+        "subReasonCode": {
+          "@id": "https://w3id.org/traceability#subReasonCode"
+        },
+        "subReasonCodeDescription": {
+          "@id": "https://w3id.org/traceability#subReasonCodeDescription"
+        },
+        "validCodeReason": {
+          "@id": "https://w3id.org/traceability#validCodeReason"
+        },
+        "validCodeReasonDescription": {
+          "@id": "https://w3id.org/traceability#validCodeReasonDescription"
+        }
       },
       "@id": "https://w3id.org/traceability#PGAStatusMessage"
     },
@@ -2166,24 +2628,27 @@
         "grossVolume": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#grossVolumeMeasure"
         },
+        "grossWeight": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#grossWeightMeasure"
+        },
         "height": {
           "@id": "https://schema.org/height"
         },
         "includedTradeLineItems": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#includedTradeLineItem"
         },
+        "netWeight": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#netWeightMeasure"
+        },
         "packagingType": {
           "@id": "https://www.gs1.org/voc/packagingMaterial"
         },
         "perPackageUnitQuantity": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#perPackageUnitQuantity"
         },
-        "shippingMarks": {
+        "physicalShippingMarks": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#physicalShippingMarks"
         },
-        "weight": {
-          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#grossWeightMeasure"
-        },
         "width": {
           "@id": "https://schema.org/width"
         }
@@ -2254,7 +2719,7 @@
           "@id": "https://schema.org/orderNumber"
         },
         "partOfOrder": {
-          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#ConsignmentItem"
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#includedConsignmentItem"
         },
         "seller": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#sellerParty"
@@ -2367,8 +2832,8 @@
         "additionalDeclaration": {
           "@id": "https://schema.org/Comment"
         },
-        "agPackage": {
-          "@id": "https://w3id.org/traceability#AgPackage"
+        "agriculturePackage": {
+          "@id": "https://w3id.org/traceability#AgriculturePackage"
         },
         "applicant": {
           "@id": "https://w3c-ccg.github.io/traceability-vocab/#dfn-entities"
@@ -2422,7 +2887,7 @@
           "@id": "https://w3id.org/traceability#portOfEntry"
         },
         "shipment": {
-          "@id": "https://schema.org/AgParcelDelivery"
+          "@id": "https://schema.org/AgricultureParcelDelivery"
         },
         "signatureDate": {
           "@id": "https://schema.org/DateTime"
@@ -2441,8 +2906,14 @@
         "globalLocationNumber": {
           "@id": "https://schema.org/globalLocationNumber"
         },
-        "unLocode": {
+        "iataAirportCode": {
           "@id": "https://onerecord.iata.org/cargo/Location#code"
+        },
+        "locationName": {
+          "@id": "https://schema.org/name"
+        },
+        "unLocode": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#UNECELOCODE"
         }
       },
       "@id": "https://schema.org/Place"
@@ -2752,7 +3223,13 @@
     },
     "SIMASteelImportLicenseCertificate": {
       "@context": {
-        "expectedDateOfImport": {
+        "licenseNumber": {
+          "@id": "https://schema.org/identifier"
+        },
+        "licenseValidFrom": {
+          "@id": "https://schema.org/validFrom"
+        },
+        "licenseValidThrough": {
           "@id": "https://schema.org/validThrough"
         }
       },
@@ -2760,11 +3237,14 @@
     },
     "SIMASteelImportProductSpecifier": {
       "@context": {
-        "product": {
-          "@id": "https://w3id.org/traceability#SteelProduct"
-        },
-        "value": {
+        "customsValue": {
           "@id": "https://schema.org/MonetaryAmount"
+        },
+        "productCategory": {
+          "@id": "https://w3id.org/traceability#ProductCategory"
+        },
+        "steelProduct": {
+          "@id": "https://w3id.org/traceability#SteelProduct"
         }
       },
       "@id": "https://w3id.org/traceability#SIMASteelImportProductSpecifier"
@@ -2804,7 +3284,7 @@
         "transportEquipmentQuantity": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#transportEquipmentQuantity"
         },
-        "transportMeansId": {
+        "vesselName": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#TransportMeans"
         },
         "vesselNumber": {
@@ -2823,14 +3303,14 @@
     },
     "Seal": {
       "@context": {
-        "ISOEquipmentCode": {
-          "@id": "https://api.swaggerhub.com/domains/dcsaorg/DCSA_DOMAIN/1.0.1#/components/schemas/sealSource"
-        },
-        "equipmentReference": {
+        "sealNumber": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#seal_number"
         },
-        "tareWeight": {
-          "@id": "https://api.swaggerhub.com/domains/dcsaorg/DCSA_DOMAIN/1.0.1#/components/schemas/sealType"
+        "sealSource": {
+          "@id": "https://api.swaggerhub.com/domains/dcsaorg/DCSA_DOMAIN/1.0.1#/components/schemas/sealSource"
+        },
+        "sealType": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#sealTypeCode"
         }
       },
       "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#Seal"
@@ -2842,6 +3322,18 @@
         },
         "calculationBasis": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#calculationBasis"
+        },
+        "chargeCode": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#chargeCategoryCode"
+        },
+        "chargeText": {
+          "@id": "https://schema.org/description"
+        },
+        "paymentTerm": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#PaymentTerms"
+        },
+        "rate": {
+          "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#unitPrice"
         }
       },
       "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#ServiceCharge"
@@ -3117,6 +3609,9 @@
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#identificationId"
         },
         "isShipperOwned": {
+          "@id": "https://api.swaggerhub.com/domains/dcsaorg/DCSA_DOMAIN/1.0.1#/components/schemas/isShipperOwned"
+        },
+        "seals": {
           "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#affixedSeal"
         },
         "tareWeight": {
@@ -3157,11 +3652,17 @@
           "@id": "https://schema.org/validThrough"
         },
         "exporterDetails": {
-          "@id": "https://w3id.org/traceability#importerUnknown"
+          "@id": "https://w3id.org/traceability#exporterDetails"
         },
         "importerDetails": {
           "@id": "https://w3id.org/traceability#importerDetails"
         },
+        "importerUnknown": {
+          "@id": "https://w3id.org/traceability#importerUnknown"
+        },
+        "producerConfidential": {
+          "@id": "https://w3id.org/traceability#producerConfidential"
+        },
         "producerDetails": {
           "@id": "https://schema.org/manufacturer"
         }
@@ -3173,7 +3674,7 @@
         "certifierDetails": {
           "@id": "https://w3id.org/traceability#certifierDetails"
         },
-        "certifierRole": {
+        "role": {
           "@id": "https://w3id.org/traceability#certifierRole"
         }
       },
@@ -3232,7 +3733,7 @@
           "@id": "https://w3id.org/traceability#serialNumber"
         },
         "shipment": {
-          "@id": "https://w3id.org/traceability#AgParcelDelivery"
+          "@id": "https://w3id.org/traceability#AgricultureParcelDelivery"
         },
         "signatureDate": {
           "@id": "https://w3id.org/traceability#signatureDate"
@@ -3341,7 +3842,7 @@
           "@id": "https://w3id.org/traceability#intendedUse"
         },
         "shipment": {
-          "@id": "https://schema.org/AgParcelDelivery"
+          "@id": "https://schema.org/AgricultureParcelDelivery"
         },
         "signatureDate": {
           "@id": "https://w3id.org/traceability#signatureDate"