diff --git a/ISO_ADM_Exporter/ISO_ADM_Exporter.csproj b/ISO_ADM_Exporter/ISO_ADM_Exporter.csproj
index 22d12b7..b363db7 100644
--- a/ISO_ADM_Exporter/ISO_ADM_Exporter.csproj
+++ b/ISO_ADM_Exporter/ISO_ADM_Exporter.csproj
@@ -10,6 +10,7 @@
     <PackageReference Include="AgGatewayADAPTFramework" Version="3.1.0" />
     <PackageReference Include="AgGatewayADMPlugin" Version="3.0.2" />
     <PackageReference Include="AgGatewayISOPlugin" Version="5.4.0" />
+    <!-- PackageReference Include="AgGateway.ADAPT.StandardPlugin" Version="0.9.7" / --> 
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
diff --git a/ISO_ADM_Exporter/Program.cs b/ISO_ADM_Exporter/Program.cs
index 266cb58..7217eb6 100644
--- a/ISO_ADM_Exporter/Program.cs
+++ b/ISO_ADM_Exporter/Program.cs
@@ -21,6 +21,7 @@ static void Main(string[] args)
 
             AgGateway.ADAPT.ISOv4Plugin.Plugin isoPlugin = new AgGateway.ADAPT.ISOv4Plugin.Plugin();
             AgGateway.ADAPT.ADMPlugin.Plugin admPlugin = new AgGateway.ADAPT.ADMPlugin.Plugin();
+            // AgGateway.ADAPT.StandardPlugin.Plugin standardPlugin = new AgGateway.ADAPT.StandardPlugin.Plugin();
 
             ;
             int countModel = models.Count;
@@ -34,9 +35,11 @@ static void Main(string[] args)
                     Directory.CreateDirectory(folder);
 
                     isoPlugin.Export(models[i], folder, p);
-                    Console.WriteLine("Wrote ISO file to " + folder);
+                    Console.WriteLine("Wrote ISO files to " + folder);
                     admPlugin.Export(models[i], folder, p);
-                    Console.WriteLine("Wrote ADM file to " + folder);
+                    Console.WriteLine("Wrote ADM files to " + folder);
+                    // standardPlugin.Export(models[i], folder, p);
+                    // Console.WriteLine("Wrote ADAPT Std files to " + folder);
 
                 }
             }
diff --git a/ISO_ADM_Exporter/output/0/TASKDATA/LINKLIST.XML b/ISO_ADM_Exporter/output/0/TASKDATA/LINKLIST.XML
index 76ffa85..19a3f58 100644
--- a/ISO_ADM_Exporter/output/0/TASKDATA/LINKLIST.XML
+++ b/ISO_ADM_Exporter/output/0/TASKDATA/LINKLIST.XML
@@ -11,6 +11,7 @@
     <LNK A="PDT1" B="Product.Name|3230Enlist" />
     <LNK A="PDT1" B="Product.BrandName|Beck's" />
     <LNK A="PDT1" B="Product.VarietyName|3230Enlist" />
+    <LNK A="PDT1" B="Product.GTIN|" />
     <LNK A="PDT1" B="Product.Classification.Type|Crop" />
     <LNK A="PDT1" B="Product.Classification.Codes.1.CropType|Soybeans" />
     <LNK A="PDT1" B="Product.Classification.Codes.1.ListAgencyId|USDA" />
@@ -31,6 +32,7 @@
     <LNK A="PDT2" B="Product.Name|3510Enlist" />
     <LNK A="PDT2" B="Product.BrandName|Beck's" />
     <LNK A="PDT2" B="Product.VarietyName|3510Enlist" />
+    <LNK A="PDT2" B="Product.GTIN|" />
     <LNK A="PDT2" B="Product.Classification.Type|Crop" />
     <LNK A="PDT2" B="Product.Classification.Codes.1.CropType|Soybeans" />
     <LNK A="PDT2" B="Product.Classification.Codes.1.ListAgencyId|USDA" />
@@ -51,6 +53,7 @@
     <LNK A="PDT3" B="Product.Name|XL 6081AM " />
     <LNK A="PDT3" B="Product.BrandName|Beck's" />
     <LNK A="PDT3" B="Product.VarietyName|XL 6081AM " />
+    <LNK A="PDT3" B="Product.GTIN|" />
     <LNK A="PDT3" B="Product.Classification.Type|Crop" />
     <LNK A="PDT3" B="Product.Classification.Codes.1.CropType|Corn" />
     <LNK A="PDT3" B="Product.Classification.Codes.1.ListAgencyId|USDA" />
@@ -71,6 +74,7 @@
     <LNK A="PDT4" B="Product.Name|XL 6241QR " />
     <LNK A="PDT4" B="Product.BrandName|Beck's" />
     <LNK A="PDT4" B="Product.VarietyName|XL 6241QR " />
+    <LNK A="PDT4" B="Product.GTIN|" />
     <LNK A="PDT4" B="Product.Classification.Type|Crop" />
     <LNK A="PDT4" B="Product.Classification.Codes.1.CropType|Corn" />
     <LNK A="PDT4" B="Product.Classification.Codes.1.ListAgencyId|USDA" />
@@ -91,6 +95,7 @@
     <LNK A="PDT5" B="Product.Name|6374VT2P B" />
     <LNK A="PDT5" B="Product.BrandName|Beck's" />
     <LNK A="PDT5" B="Product.VarietyName|6374VT2P B" />
+    <LNK A="PDT5" B="Product.GTIN|" />
     <LNK A="PDT5" B="Product.Classification.Type|Crop" />
     <LNK A="PDT5" B="Product.Classification.Codes.1.CropType|Corn" />
     <LNK A="PDT5" B="Product.Classification.Codes.1.ListAgencyId|USDA" />
@@ -111,6 +116,7 @@
     <LNK A="PDT6" B="Product.Name|6414VT2P B" />
     <LNK A="PDT6" B="Product.BrandName|Beck's" />
     <LNK A="PDT6" B="Product.VarietyName|6414VT2P B" />
+    <LNK A="PDT6" B="Product.GTIN|" />
     <LNK A="PDT6" B="Product.Classification.Type|Crop" />
     <LNK A="PDT6" B="Product.Classification.Codes.1.Corn|C" />
     <LNK A="PDT6" B="Product.Classification.Codes.1.ListAgencyId|AGIIS" />
@@ -129,6 +135,7 @@
     <LNK A="PDT7" B="Product.Name|3830Enlist" />
     <LNK A="PDT7" B="Product.BrandName|Beck's" />
     <LNK A="PDT7" B="Product.VarietyName|3830Enlist" />
+    <LNK A="PDT7" B="Product.GTIN|" />
     <LNK A="PDT7" B="Product.Classification.Type|Crop" />
     <LNK A="PDT7" B="Product.Classification.Codes.1.CropType|Soybeans" />
     <LNK A="PDT7" B="Product.Classification.Codes.1.ListAgencyId|USDA" />
@@ -149,6 +156,7 @@
     <LNK A="PDT8" B="Product.Name|4320Enlist" />
     <LNK A="PDT8" B="Product.BrandName|Beck's" />
     <LNK A="PDT8" B="Product.VarietyName|4320Enlist" />
+    <LNK A="PDT8" B="Product.GTIN|" />
     <LNK A="PDT8" B="Product.Classification.Type|Crop" />
     <LNK A="PDT8" B="Product.Classification.Codes.1.CropType|Soybeans" />
     <LNK A="PDT8" B="Product.Classification.Codes.1.ListAgencyId|USDA" />
@@ -169,6 +177,7 @@
     <LNK A="PDT9" B="Product.Name|4030Enlist" />
     <LNK A="PDT9" B="Product.BrandName|Beck's" />
     <LNK A="PDT9" B="Product.VarietyName|4030Enlist" />
+    <LNK A="PDT9" B="Product.GTIN|" />
     <LNK A="PDT9" B="Product.Classification.Type|Crop" />
     <LNK A="PDT9" B="Product.Classification.Codes.1.CropType|Soybeans" />
     <LNK A="PDT9" B="Product.Classification.Codes.1.ListAgencyId|USDA" />
@@ -188,6 +197,7 @@
     <LNK A="PDT10" B="Product.Name|3030Enlist" />
     <LNK A="PDT10" B="Product.BrandName|Beck's" />
     <LNK A="PDT10" B="Product.VarietyName|3030Enlist" />
+    <LNK A="PDT10" B="Product.GTIN|" />
     <LNK A="PDT10" B="Product.Classification.Type|Crop" />
     <LNK A="PDT10" B="Product.Classification.Codes.1.CropType|Soybeans" />
     <LNK A="PDT10" B="Product.Classification.Codes.1.ListAgencyId|USDA" />
@@ -208,6 +218,7 @@
     <LNK A="PDT11" B="Product.Name|4030Enlist" />
     <LNK A="PDT11" B="Product.BrandName|Beck's" />
     <LNK A="PDT11" B="Product.VarietyName|4030Enlist" />
+    <LNK A="PDT11" B="Product.GTIN|" />
     <LNK A="PDT11" B="Product.Classification.Type|Crop" />
     <LNK A="PDT11" B="Product.Classification.Codes.1.CropType|Soybeans" />
     <LNK A="PDT11" B="Product.Classification.Codes.1.ListAgencyId|USDA" />
@@ -228,6 +239,7 @@
     <LNK A="PDT12" B="Product.Name|A6544" />
     <LNK A="PDT12" B="Product.BrandName|AgriGold" />
     <LNK A="PDT12" B="Product.VarietyName|A6544" />
+    <LNK A="PDT12" B="Product.GTIN|" />
     <LNK A="PDT12" B="Product.Classification.Type|Crop" />
     <LNK A="PDT12" B="Product.Classification.Codes.1.CropType|Corn" />
     <LNK A="PDT12" B="Product.Classification.Codes.1.ListAgencyId|USDA" />
@@ -246,6 +258,7 @@
     <LNK A="PDT13" B="Product.Name|A64516" />
     <LNK A="PDT13" B="Product.BrandName|AgriGold" />
     <LNK A="PDT13" B="Product.VarietyName|A64516" />
+    <LNK A="PDT13" B="Product.GTIN|" />
     <LNK A="PDT13" B="Product.Classification.Type|Crop" />
     <LNK A="PDT13" B="Product.Classification.Codes.1.CropType|Corn" />
     <LNK A="PDT13" B="Product.Classification.Codes.1.ListAgencyId|USDA" />
@@ -264,6 +277,7 @@
     <LNK A="PDT14" B="Product.Name|A64259" />
     <LNK A="PDT14" B="Product.BrandName|AgriGold" />
     <LNK A="PDT14" B="Product.VarietyName|A64259" />
+    <LNK A="PDT14" B="Product.GTIN|" />
     <LNK A="PDT14" B="Product.Classification.Type|Crop" />
     <LNK A="PDT14" B="Product.Classification.Codes.1.CropType|Corn" />
     <LNK A="PDT14" B="Product.Classification.Codes.1.ListAgencyId|USDA" />
diff --git a/ISO_ADM_Exporter/output/0/TASKDATA/TASKDATA.XML b/ISO_ADM_Exporter/output/0/TASKDATA/TASKDATA.XML
index aada52f..1ab66e0 100644
--- a/ISO_ADM_Exporter/output/0/TASKDATA/TASKDATA.XML
+++ b/ISO_ADM_Exporter/output/0/TASKDATA/TASKDATA.XML
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ISO11783_TaskData VersionMajor="4" VersionMinor="2" ManagementSoftwareManufacturer="AgGateway" ManagementSoftwareVersion="1.0" TaskControllerManufacturer="" TaskControllerVersion="" DataTransferOrigin="1">
-  <!--Export created 5/1/2025 10:45:19 PM-->
+  <!--Export created 8/8/2025 7:15:34 AM-->
   <PGP A="PGP1" B="CropType" C="2" />
   <CTP A="CTP1" B="Soybeans" C="PGP1">
     <CVT A="CVT1" B="3230Enlist-E22388816X" C="PDT1" />
diff --git a/ISO_ADM_Exporter/output/0/adapt.json b/ISO_ADM_Exporter/output/0/adapt.json
new file mode 100644
index 0000000..f02002b
--- /dev/null
+++ b/ISO_ADM_Exporter/output/0/adapt.json
@@ -0,0 +1,1493 @@
+{
+  "catalog": {
+    "brands": [
+      {
+        "id": {
+          "referenceId": "-3"
+        },
+        "name": "Beck's"
+      },
+      {
+        "id": {
+          "referenceId": "-17"
+        },
+        "name": "AgriGold"
+      }
+    ],
+    "crops": [
+      {
+        "id": {
+          "referenceId": "-2",
+          "uniqueIds": [
+            {
+              "idSource": "USDA",
+              "idText": "S",
+              "idTypeCode": "STRING"
+            }
+          ]
+        },
+        "name": "Soybeans"
+      },
+      {
+        "id": {
+          "referenceId": "-7",
+          "uniqueIds": [
+            {
+              "idSource": "USDA",
+              "idText": "C",
+              "idTypeCode": "STRING"
+            }
+          ]
+        },
+        "name": "Corn"
+      }
+    ],
+    "customDataTypeDefinitions": [
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.Type",
+        "name": "Product.Type ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.Description",
+        "name": "Product.Description ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.Name",
+        "name": "Product.Name ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.BrandName",
+        "name": "Product.BrandName ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.VarietyName",
+        "name": "Product.VarietyName ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.GTIN",
+        "name": "Product.GTIN ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Type",
+        "name": "Type ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Codes",
+        "name": "Codes ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.Classification",
+        "name": "Product.Classification ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "LotIdentifier",
+        "name": "LotIdentifier ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "ShipFromGLN",
+        "name": "ShipFromGLN ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "ShipmentId",
+        "name": "ShipmentId ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "ShippingContainer.Type",
+        "name": "ShippingContainer.Type ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "ShippingContainer.Id. USDOT_Number",
+        "name": "ShippingContainer.Id. USDOT_Number ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Carrier.SCAC",
+        "name": "Carrier.SCAC ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "ShipmentReference",
+        "name": "ShipmentReference ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "InFieldProductID.API.Path.id",
+        "name": "InFieldProductID.API.Path.id ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Name",
+        "name": "Name ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Id",
+        "name": "Id ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "SeedTreatment",
+        "name": "SeedTreatment ()"
+      }
+    ],
+    "description": "/home/dubnemo/ShippedItemInstancePlugin/SampleData/v4/2022-BecksShipment-DTtestV4.json",
+    "farms": [],
+    "fields": [],
+    "growers": [
+      {
+        "id": {
+          "referenceId": "-4",
+          "uniqueIds": [
+            {
+              "idSource": "RetailerERPAccount",
+              "idText": "13",
+              "idTypeCode": "STRING"
+            }
+          ]
+        },
+        "name": "Jeremy Wilson"
+      }
+    ],
+    "products": [
+      {
+        "brandId": "-3",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "3230Enlist SDBX ESCALATE SDS+ BEANS"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "3230Enlist"
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "Beck's"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "3230Enlist"
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "definitionCode": "LotIdentifier",
+            "valueText": "E22388816X"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1369458675000"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "7302"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id. USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "6af79ed0-cc35-11ee-b08c-81db61397719"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Name",
+                "valueText": "ESCALATE SDS+"
+              },
+              {
+                "definitionCode": "Id",
+                "valueText": "ESCALATE SDS+"
+              }
+            ],
+            "definitionCode": "SeedTreatment"
+          }
+        ],
+        "cropId": "-2",
+        "id": {
+          "referenceId": "-1"
+        },
+        "name": "3230Enlist-E22388816X",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      },
+      {
+        "brandId": "-3",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "3510Enlist SDBX ESCALATE BEANS"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "3510Enlist"
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "Beck's"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "3510Enlist"
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "definitionCode": "LotIdentifier",
+            "valueText": "F2212127X"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1369458675000"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "7302"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id. USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "6b072f30-cc35-11ee-b08c-81db61397719"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Name",
+                "valueText": "ESCALATE"
+              },
+              {
+                "definitionCode": "Id",
+                "valueText": "ESCALATE"
+              }
+            ],
+            "definitionCode": "SeedTreatment"
+          }
+        ],
+        "cropId": "-2",
+        "id": {
+          "referenceId": "-5"
+        },
+        "name": "3510Enlist-F2212127X",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      },
+      {
+        "brandId": "-3",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "XL 6081AM BAG ESCALATE MED FLAT CORN"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "XL 6081AM "
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "Beck's"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "XL 6081AM "
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "definitionCode": "LotIdentifier",
+            "valueText": "S116FF"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1369458675000"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "7302"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id. USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "6b167170-cc35-11ee-b08c-81db61397719"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Name",
+                "valueText": "ESCALATE"
+              },
+              {
+                "definitionCode": "Id",
+                "valueText": "ESCALATE"
+              }
+            ],
+            "definitionCode": "SeedTreatment"
+          }
+        ],
+        "cropId": "-7",
+        "id": {
+          "referenceId": "-6"
+        },
+        "name": "XL 6081AM -S116FF",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      },
+      {
+        "brandId": "-3",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "XL 6241QR BAG ESCALATE MED FLAT CORN"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "XL 6241QR "
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "Beck's"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "XL 6241QR "
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "definitionCode": "LotIdentifier",
+            "valueText": "S260FF"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1369458675000"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "7302"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id. USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "6b25dac0-cc35-11ee-b08c-81db61397719"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Name",
+                "valueText": "ESCALATE"
+              },
+              {
+                "definitionCode": "Id",
+                "valueText": "ESCALATE"
+              }
+            ],
+            "definitionCode": "SeedTreatment"
+          }
+        ],
+        "cropId": "-7",
+        "id": {
+          "referenceId": "-8"
+        },
+        "name": "XL 6241QR -S260FF",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      },
+      {
+        "brandId": "-3",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "6374VT2P BAG ESCALATE MED FLAT CORN"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "6374VT2P B"
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "Beck's"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "6374VT2P B"
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "definitionCode": "LotIdentifier",
+            "valueText": "S65FF"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1369458675000"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "7302"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id. USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "6b354410-cc35-11ee-b08c-81db61397719"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Name",
+                "valueText": "ESCALATE"
+              },
+              {
+                "definitionCode": "Id",
+                "valueText": "ESCALATE"
+              }
+            ],
+            "definitionCode": "SeedTreatment"
+          }
+        ],
+        "cropId": "-7",
+        "id": {
+          "referenceId": "-9"
+        },
+        "name": "6374VT2P B-S65FF",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      },
+      {
+        "brandId": "-3",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "6414VT2P BAG ESCALATE MED FLAT CORN"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "6414VT2P B"
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "Beck's"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "6414VT2P B"
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "definitionCode": "LotIdentifier",
+            "valueText": "E181FF"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1369458675000"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "7302"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id. USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "6b44ad60-cc35-11ee-b08c-81db61397719"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Name",
+                "valueText": "ESCALATE"
+              },
+              {
+                "definitionCode": "Id",
+                "valueText": "ESCALATE"
+              }
+            ],
+            "definitionCode": "SeedTreatment"
+          }
+        ],
+        "cropId": "0",
+        "id": {
+          "referenceId": "-10"
+        },
+        "name": "6414VT2P B-E181FF",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      },
+      {
+        "brandId": "-3",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "3830Enlist SDBX ESCALATE SDS+ BEANS"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "3830Enlist"
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "Beck's"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "3830Enlist"
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "definitionCode": "LotIdentifier",
+            "valueText": "F22121214X"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1369458675000"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "7302"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id. USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "6b53efa0-cc35-11ee-b08c-81db61397719"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Name",
+                "valueText": "ESCALATE SDS+"
+              },
+              {
+                "definitionCode": "Id",
+                "valueText": "ESCALATE SDS+"
+              }
+            ],
+            "definitionCode": "SeedTreatment"
+          }
+        ],
+        "cropId": "-2",
+        "id": {
+          "referenceId": "-11"
+        },
+        "name": "3830Enlist-F22121214X",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      },
+      {
+        "brandId": "-3",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "4320Enlist SDBX EXCALATE SDS+ BEANS"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "4320Enlist"
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "Beck's"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "4320Enlist"
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "definitionCode": "LotIdentifier",
+            "valueText": "A22242312X"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1369458675000"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "7302"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id. USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "6b6358f0-cc35-11ee-b08c-81db61397719"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Name",
+                "valueText": "ESCALATE SDS+"
+              },
+              {
+                "definitionCode": "Id",
+                "valueText": "ESCALATE SDS+"
+              }
+            ],
+            "definitionCode": "SeedTreatment"
+          }
+        ],
+        "cropId": "-2",
+        "id": {
+          "referenceId": "-12"
+        },
+        "name": "4320Enlist-A22242312X",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      },
+      {
+        "brandId": "-3",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "4030Enlist SDBX ESCALATE SDS+ BEANS"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "4030Enlist"
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "Beck's"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "4030Enlist"
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1369458675000"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "7302"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id. USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "6b729b30-cc35-11ee-b08c-81db61397719"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Name",
+                "valueText": "ESCALATE SDS+"
+              },
+              {
+                "definitionCode": "Id",
+                "valueText": "ESCALATE SDS+"
+              }
+            ],
+            "definitionCode": "SeedTreatment"
+          }
+        ],
+        "cropId": "-2",
+        "id": {
+          "referenceId": "-13"
+        },
+        "name": "4030Enlist-B2227251X",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      },
+      {
+        "brandId": "-3",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "3030Enlist SDBX ESCALATE SDS+ BEANS"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "3030Enlist"
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "Beck's"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "3030Enlist"
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "definitionCode": "LotIdentifier",
+            "valueText": "E2238579X"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1369458675000"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "7302"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id. USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "6b820480-cc35-11ee-b08c-81db61397719"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Name",
+                "valueText": "ESCALATE SDS+"
+              },
+              {
+                "definitionCode": "Id",
+                "valueText": "ESCALATE SDS+"
+              }
+            ],
+            "definitionCode": "SeedTreatment"
+          }
+        ],
+        "cropId": "-2",
+        "id": {
+          "referenceId": "-14"
+        },
+        "name": "3030Enlist-E2238579X",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      },
+      {
+        "brandId": "-3",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "4030Enlist SDBX ILEVO TWO BEANS"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "4030Enlist"
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "Beck's"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "4030Enlist"
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "definitionCode": "LotIdentifier",
+            "valueText": "B2223136XI"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1369458675000"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "7302"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id. USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "6b9194e0-cc35-11ee-b08c-81db61397719"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Name",
+                "valueText": "ILEVO"
+              },
+              {
+                "definitionCode": "Id",
+                "valueText": "ILEVO"
+              }
+            ],
+            "definitionCode": "SeedTreatment"
+          }
+        ],
+        "cropId": "-2",
+        "id": {
+          "referenceId": "-15"
+        },
+        "name": "4030Enlist-B2223136XI",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      },
+      {
+        "brandId": "-17",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "A6544-VT2RIB"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "A6544"
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "AgriGold"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "A6544"
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "definitionCode": "LotIdentifier",
+            "valueText": "EF06466361"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1369458675000"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "7302"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id. USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "6ba0d720-cc35-11ee-b08c-81db61397719"
+          }
+        ],
+        "cropId": "-7",
+        "id": {
+          "referenceId": "-16"
+        },
+        "name": "A6544-EF06466361",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      },
+      {
+        "brandId": "-17",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "A64516-VT2RIB"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "A64516"
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "AgriGold"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "A64516"
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "definitionCode": "LotIdentifier",
+            "valueText": "EF09168506"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1369458675000"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "7302"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id. USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "6bb04070-cc35-11ee-b08c-81db61397719"
+          }
+        ],
+        "cropId": "-7",
+        "id": {
+          "referenceId": "-18"
+        },
+        "name": "A64516-EF09168506",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      },
+      {
+        "brandId": "-17",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "A64259-VT2RIB"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "A64259"
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "AgriGold"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "A64259"
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": ""
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "definitionCode": "LotIdentifier",
+            "valueText": "II36062097"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1369458675000"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "7302"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id. USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "6bbf82b0-cc35-11ee-b08c-81db61397719"
+          }
+        ],
+        "cropId": "-7",
+        "id": {
+          "referenceId": "-19"
+        },
+        "name": "A64259-II36062097",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      }
+    ]
+  },
+  "documents": {
+    "workRecords": []
+  },
+  "rootSchemaVersion": "2.0.0"
+}
\ No newline at end of file
diff --git a/ISO_ADM_Exporter/output/0/adm/Catalog.adm b/ISO_ADM_Exporter/output/0/adm/Catalog.adm
index 8cbbe40..e468f58 100644
Binary files a/ISO_ADM_Exporter/output/0/adm/Catalog.adm and b/ISO_ADM_Exporter/output/0/adm/Catalog.adm differ
diff --git a/ISO_ADM_Exporter/output/1/TASKDATA/LINKLIST.XML b/ISO_ADM_Exporter/output/1/TASKDATA/LINKLIST.XML
index c70cfbc..a9c9ec0 100644
--- a/ISO_ADM_Exporter/output/1/TASKDATA/LINKLIST.XML
+++ b/ISO_ADM_Exporter/output/1/TASKDATA/LINKLIST.XML
@@ -10,6 +10,7 @@
     <LNK A="PDT1" B="Product.Name|CP2585" />
     <LNK A="PDT1" B="Product.BrandName|CROPLAN" />
     <LNK A="PDT1" B="Product.VarietyName|VT2P/RIB" />
+    <LNK A="PDT1" B="Product.GTIN|00888346580291" />
     <LNK A="PDT1" B="Product.PerPackageQuantity|55" />
     <LNK A="PDT1" B="Product.PerPackageQuantity.UOM|LB" />
     <LNK A="PDT1" B="Product.Classification.Type|Crop" />
@@ -23,7 +24,7 @@
     <LNK A="PDT1" B="Packaging.SeedBox.Id|844f95ac-422a-406a-91c5-65d017de2f09" />
     <LNK A="PDT1" B="Packaging.SeedBox.GrossWeight|2475" />
     <LNK A="PDT1" B="Packaging.SeedBox.GrossWeight.UOM|LB" />
-    <LNK A="PDT1" B="Packaging.SeedBox.PackageQuantity|45" />
+    <LNK A="PDT1" B="Packaging.SeedBox.SeedBox|45" />
     <LNK A="PDT1" B="Packaging.SeedBox.PackageQuantity.UOM|BG" />
     <LNK A="PDT1" B="ShipmentReference.ShipFromGLN|1100028417954" />
     <LNK A="PDT1" B="ShipmentReference.ShipmentId|34343535" />
@@ -38,6 +39,7 @@
     <LNK A="PDT1" B="Results.QuantitativeMeasurements.1.SeedCount|892" />
     <LNK A="PDT1" B="Results.QuantitativeMeasurements.1.SeedCount.UOM|count/bg" />
     <LNK A="PDT1" B="Results.QuantitativeMeasurements.1.SeedCount.Timestamp|2/8/2021 12:17:45 PM" />
+    <LNK A="PDT1" B="SeedTreatment.TreatmentType|Fungicide" />
     <LNK A="PDT1" B="SeedTreatment.Name|Fortivent® Plus" />
     <LNK A="PDT1" B="SeedTreatment.Id|1001339" />
     <LNK A="PDT1" B="SeedTreatment.Substance.Name|Ethaboxam Fungicide" />
diff --git a/ISO_ADM_Exporter/output/1/TASKDATA/TASKDATA.XML b/ISO_ADM_Exporter/output/1/TASKDATA/TASKDATA.XML
index de7d73e..81b5362 100644
--- a/ISO_ADM_Exporter/output/1/TASKDATA/TASKDATA.XML
+++ b/ISO_ADM_Exporter/output/1/TASKDATA/TASKDATA.XML
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ISO11783_TaskData VersionMajor="4" VersionMinor="2" ManagementSoftwareManufacturer="AgGateway" ManagementSoftwareVersion="1.0" TaskControllerManufacturer="" TaskControllerVersion="" DataTransferOrigin="1">
-  <!--Export created 5/1/2025 10:45:20 PM-->
+  <!--Export created 8/8/2025 7:15:35 AM-->
   <PGP A="PGP1" B="CropType" C="2" />
   <CTP A="CTP1" B="Corn" C="PGP1">
     <CVT A="CVT1" B="CP2585-769MXJ4JX" C="PDT1" />
diff --git a/ISO_ADM_Exporter/output/1/adapt.json b/ISO_ADM_Exporter/output/1/adapt.json
new file mode 100644
index 0000000..9699fe7
--- /dev/null
+++ b/ISO_ADM_Exporter/output/1/adapt.json
@@ -0,0 +1,472 @@
+{
+  "catalog": {
+    "brands": [
+      {
+        "id": {
+          "referenceId": "-23"
+        },
+        "manufacturerId": "-22",
+        "name": "CROPLAN"
+      }
+    ],
+    "crops": [
+      {
+        "id": {
+          "referenceId": "-21",
+          "uniqueIds": [
+            {
+              "idSource": "USDA",
+              "idText": "C",
+              "idTypeCode": "STRING"
+            }
+          ]
+        },
+        "name": "Corn"
+      }
+    ],
+    "customDataTypeDefinitions": [
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.Type",
+        "name": "Product.Type ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.Description",
+        "name": "Product.Description ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.Name",
+        "name": "Product.Name ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.BrandName",
+        "name": "Product.BrandName ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.VarietyName",
+        "name": "Product.VarietyName ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.GTIN",
+        "name": "Product.GTIN ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.PerPackageQuantity",
+        "name": "Product.PerPackageQuantity ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.PerPackageQuantity.UOM",
+        "name": "Product.PerPackageQuantity.UOM ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Type",
+        "name": "Type ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Codes",
+        "name": "Codes ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Product.Classification",
+        "name": "Product.Classification ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "LotIdentifier",
+        "name": "LotIdentifier ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "ShipUnitTypeCode",
+        "name": "ShipUnitTypeCode ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "SeedBox.Id",
+        "name": "SeedBox.Id ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "SeedBox.GrossWeight",
+        "name": "SeedBox.GrossWeight ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "SeedBox.GrossWeight.UOM",
+        "name": "SeedBox.GrossWeight.UOM ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "SeedBox.SeedBox",
+        "name": "SeedBox.SeedBox ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "SeedBox.PackageQuantity.UOM",
+        "name": "SeedBox.PackageQuantity.UOM ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Packaging",
+        "name": "Packaging ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "ShipFromGLN",
+        "name": "ShipFromGLN ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "ShipmentId",
+        "name": "ShipmentId ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "ShippingContainer.Type",
+        "name": "ShippingContainer.Type ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "ShippingContainer.Id.USDOT_Number",
+        "name": "ShippingContainer.Id.USDOT_Number ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Carrier.SCAC",
+        "name": "Carrier.SCAC ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "ShipmentReference",
+        "name": "ShipmentReference ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "InFieldProductID.API.Path.id",
+        "name": "InFieldProductID.API.Path.id ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "AgGateway",
+        "name": "AgGateway ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "RelatedIdentifiers",
+        "name": "RelatedIdentifiers ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "encodingSchemaId",
+        "name": "encodingSchemaId ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "DataMatrixId",
+        "name": "DataMatrixId ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "schemaAgencyId",
+        "name": "schemaAgencyId ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "EncodedIdentification",
+        "name": "EncodedIdentification ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "QuantitativeMeasurements.1",
+        "name": "QuantitativeMeasurements.1 ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Results",
+        "name": "Results ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "TreatmentType",
+        "name": "TreatmentType ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Name",
+        "name": "Name ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Id",
+        "name": "Id ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "Substance",
+        "name": "Substance ()"
+      },
+      {
+        "dataDefinitionBaseTypeCode": "TEXT",
+        "dataDefinitionStatusCode": "INVALID",
+        "definitionCode": "SeedTreatment",
+        "name": "SeedTreatment ()"
+      }
+    ],
+    "description": "/home/dubnemo/ShippedItemInstancePlugin/SampleData/v4/shippedItemInstanceSwaggerGeneratedV4.json",
+    "farms": [],
+    "fields": [],
+    "growers": [
+      {
+        "id": {
+          "referenceId": "-24",
+          "uniqueIds": [
+            {
+              "idSource": "RetailerERPAccount",
+              "idText": "12345",
+              "idTypeCode": "STRING"
+            }
+          ]
+        },
+        "name": "Farmer Bob"
+      }
+    ],
+    "manufacturers": [
+      {
+        "id": {
+          "referenceId": "-22"
+        },
+        "name": "WinField United"
+      }
+    ],
+    "products": [
+      {
+        "brandId": "-23",
+        "contextItems": [
+          {
+            "definitionCode": "Product.Type",
+            "valueText": "SEED"
+          },
+          {
+            "definitionCode": "Product.Description",
+            "valueText": "VT DoublePro RIB Complete Relative Maturity 85 days"
+          },
+          {
+            "definitionCode": "Product.Name",
+            "valueText": "CP2585"
+          },
+          {
+            "definitionCode": "Product.BrandName",
+            "valueText": "CROPLAN"
+          },
+          {
+            "definitionCode": "Product.VarietyName",
+            "valueText": "VT2P/RIB"
+          },
+          {
+            "definitionCode": "Product.GTIN",
+            "valueText": "00888346580291"
+          },
+          {
+            "definitionCode": "Product.PerPackageQuantity",
+            "valueText": "55"
+          },
+          {
+            "definitionCode": "Product.PerPackageQuantity.UOM",
+            "valueText": "LB"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "Type",
+                "valueText": "Crop"
+              },
+              {
+                "definitionCode": "Codes"
+              }
+            ],
+            "definitionCode": "Product.Classification",
+            "valueText": ""
+          },
+          {
+            "definitionCode": "LotIdentifier",
+            "valueText": "769MXJ4JX"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipUnitTypeCode",
+                "valueText": "SeedBox"
+              },
+              {
+                "definitionCode": "SeedBox.Id",
+                "valueText": "844f95ac-422a-406a-91c5-65d017de2f09"
+              },
+              {
+                "definitionCode": "SeedBox.GrossWeight",
+                "valueText": "2475"
+              },
+              {
+                "definitionCode": "SeedBox.GrossWeight.UOM",
+                "valueText": "LB"
+              },
+              {
+                "definitionCode": "SeedBox.SeedBox",
+                "valueText": "45"
+              },
+              {
+                "definitionCode": "SeedBox.PackageQuantity.UOM",
+                "valueText": "BG"
+              }
+            ],
+            "definitionCode": "Packaging"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "ShipFromGLN",
+                "valueText": "1100028417954"
+              },
+              {
+                "definitionCode": "ShipmentId",
+                "valueText": "34343535"
+              },
+              {
+                "definitionCode": "ShippingContainer.Type",
+                "valueText": "Semi-Trailer"
+              },
+              {
+                "definitionCode": "ShippingContainer.Id.USDOT_Number",
+                "valueText": "12345678"
+              },
+              {
+                "definitionCode": "Carrier.SCAC",
+                "valueText": "NA"
+              }
+            ],
+            "definitionCode": "ShipmentReference"
+          },
+          {
+            "definitionCode": "InFieldProductID.API.Path.id",
+            "valueText": "0-539f82b1-df6e-11e9-b486-5ce0c51e62ce"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "AgGateway",
+                "valueText": "AGIIS"
+              }
+            ],
+            "definitionCode": "RelatedIdentifiers"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "encodingSchemaId",
+                "valueText": "DataMatrix"
+              },
+              {
+                "definitionCode": "DataMatrixId",
+                "valueText": "0-539f82b1-df6e-11e9-b486-5ce0c51e62ce"
+              },
+              {
+                "definitionCode": "schemaAgencyId",
+                "valueText": "GS1"
+              }
+            ],
+            "definitionCode": "EncodedIdentification"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "QuantitativeMeasurements.1"
+              }
+            ],
+            "definitionCode": "Results"
+          },
+          {
+            "contextItems": [
+              {
+                "definitionCode": "TreatmentType",
+                "valueText": "Fungicide"
+              },
+              {
+                "definitionCode": "Name",
+                "valueText": "Fortivent® Plus"
+              },
+              {
+                "definitionCode": "Id",
+                "valueText": "1001339"
+              },
+              {
+                "definitionCode": "Substance",
+                "valueText": ""
+              }
+            ],
+            "definitionCode": "SeedTreatment"
+          }
+        ],
+        "cropId": "-21",
+        "id": {
+          "referenceId": "-20"
+        },
+        "manufacturerId": "-22",
+        "name": "CP2585-769MXJ4JX",
+        "productFormCode": "SOLID",
+        "productStatusCode": "ACTIVE",
+        "productTypeCode": "NOT_SPECIFIED"
+      }
+    ]
+  },
+  "documents": {
+    "workRecords": []
+  },
+  "rootSchemaVersion": "2.0.0"
+}
\ No newline at end of file
diff --git a/ISO_ADM_Exporter/output/1/adm/Catalog.adm b/ISO_ADM_Exporter/output/1/adm/Catalog.adm
index 81c5907..3ccfb87 100644
Binary files a/ISO_ADM_Exporter/output/1/adm/Catalog.adm and b/ISO_ADM_Exporter/output/1/adm/Catalog.adm differ
diff --git a/SampleData/v4/shippedItemInstanceSwaggerGeneratedV4.json b/SampleData/v4/shippedItemInstanceSwaggerGeneratedV4.json
index 9e6cd57..9a53b6a 100644
--- a/SampleData/v4/shippedItemInstanceSwaggerGeneratedV4.json
+++ b/SampleData/v4/shippedItemInstanceSwaggerGeneratedV4.json
@@ -84,6 +84,7 @@
         "varietyName": "VT2P/RIB",
         "itemTreatment": {
           "id": "1001339",
+          "typeCode": "Fungicide",
           "name": "Fortivent® Plus",
           "substance": [
             {
diff --git a/ShippedItemInstancePlugin/Mapper.cs b/ShippedItemInstancePlugin/Mapper.cs
index 96c84f7..02ebb36 100644
--- a/ShippedItemInstancePlugin/Mapper.cs
+++ b/ShippedItemInstancePlugin/Mapper.cs
@@ -275,8 +275,7 @@ private List<ContextItem> CreateProductInstanceSpecificContextItems(ShippedItemI
                 // need SII model point release change - Quantity.TypeCode added (preferred)
                 // or Package.Quantity as an array
                 //
-                contextItem.NestedItems.Add(CreateContextItem(shippedItemInstance.Packaging.TypeCode +
-                    ".PackageQuantity"
+                contextItem.NestedItems.Add(CreateContextItem(shippedItemInstance.Packaging.TypeCode +"." + shippedItemInstance.Packaging.TypeCode 
                     , shippedItemInstance.Quantity.Content.ToString()));
                 contextItem.NestedItems.Add(CreateContextItem(shippedItemInstance.Packaging.TypeCode +
                     ".PackageQuantity.UOM"
@@ -403,7 +402,11 @@ private ContextItem CreateItemTreatmentContextItem(ShippedItemInstance shippedIt
         {
             ItemItemTreatment seedTreatment = shippedItemInstance.Item.ItemTreatment;
             ContextItem seedTreatmentContextItem = CreateContextItem("SeedTreatment", null);
-            if (seedTreatment.Name != null && seedTreatment.Id != null)
+            if (seedTreatment?.TypeCode != null)
+            {
+                seedTreatmentContextItem.NestedItems.Add(CreateContextItem("TreatmentType", seedTreatment.TypeCode));
+            }
+            if (seedTreatment?.Name != null && seedTreatment?.Id != null )
             {
                 seedTreatmentContextItem.NestedItems.Add(CreateContextItem("Name", seedTreatment.Name));
                 seedTreatmentContextItem.NestedItems.Add(CreateContextItem("Id", seedTreatment.Id));
@@ -529,23 +532,30 @@ private List<ContextItem> CreateProductContextItems(ShippedItemInstance shippedI
             {
                 contextItems.Add(CreateContextItem("Product.Type", shippedItemInstance.TypeCode));
             }
-            if (shippedItemInstance.Item.Description != null)
+            if (shippedItemInstance.Item?.Description != null)
             {
                 contextItems.Add(CreateContextItem("Product.Description", shippedItemInstance.Item.Description));
             }
-            if (shippedItemInstance.Item.ProductName != null)
+            if (shippedItemInstance.Item?.ProductName != null)
             {
                 contextItems.Add(CreateContextItem("Product.Name", shippedItemInstance.Item.ProductName));
             }
-            if (shippedItemInstance.Item.BrandName != null)
+            if (shippedItemInstance.Item?.BrandName != null)
             {
                 contextItems.Add(CreateContextItem("Product.BrandName", shippedItemInstance.Item.BrandName));
             }
-            if (shippedItemInstance.Item.VarietyName != null)
+            if (shippedItemInstance.Item?.VarietyName != null)
             {
                 contextItems.Add(CreateContextItem("Product.VarietyName", shippedItemInstance.Item.VarietyName));
             }
 
+            // gtin -- should I add this to unique identifer on product?
+
+            if (shippedItemInstance.Item?.Gtinid != null)
+            {
+                contextItems.Add(CreateContextItem("Product.GTIN", shippedItemInstance.Item.Gtinid));
+            }
+            
             // item perPackage quantity, e.g., weight of a bag
             //
             if (shippedItemInstance.Item?.Packaging?.PerPackageQuantity?.Content != null &&
@@ -641,15 +651,6 @@ private void SetManufacturerAndBrand(ShippedItemInstance shippedItemInstance, Pr
                     // it appears that the Add method generates the Id.ReferenceId
                     product.BrandId = brandName.Id.ReferenceId;
 
-                    // map to contentItems
-                    //
-                    // gtin , add this to unique identifer on product?
-                    //
-                    var gtin = shippedItemInstance.Item.Gtinid;
-                    _logger.LogInformation("GTIN = " + gtin);
-                    //
-                    // Where is gtin used?
-                    //
                     // create a colleciton of Product components and add substatnce to it
                     // var productComponents = shippedItemInstance.Item.ItemTreatment.Substance.FirstOrDefault(s => s.Name = )
                     // product.ProductComponents = shippedItemInstance.Item.ItemTreatment.Substance
diff --git a/ShippedItemInstancePlugin/Models/CarrierParty.cs b/ShippedItemInstancePlugin/Models/CarrierParty.cs
index 1c94f7b..8f97ff2 100644
--- a/ShippedItemInstancePlugin/Models/CarrierParty.cs
+++ b/ShippedItemInstancePlugin/Models/CarrierParty.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/Classification.cs b/ShippedItemInstancePlugin/Models/Classification.cs
index c179022..bf2f3f7 100644
--- a/ShippedItemInstancePlugin/Models/Classification.cs
+++ b/ShippedItemInstancePlugin/Models/Classification.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ClassificationCodes.cs b/ShippedItemInstancePlugin/Models/ClassificationCodes.cs
index ef36c3b..ad2ab80 100644
--- a/ShippedItemInstancePlugin/Models/ClassificationCodes.cs
+++ b/ShippedItemInstancePlugin/Models/ClassificationCodes.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ClassificationCodesCode.cs b/ShippedItemInstancePlugin/Models/ClassificationCodesCode.cs
index 27d6394..826537b 100644
--- a/ShippedItemInstancePlugin/Models/ClassificationCodesCode.cs
+++ b/ShippedItemInstancePlugin/Models/ClassificationCodesCode.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/Item.cs b/ShippedItemInstancePlugin/Models/Item.cs
index 11a1cfd..1f4e108 100644
--- a/ShippedItemInstancePlugin/Models/Item.cs
+++ b/ShippedItemInstancePlugin/Models/Item.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ItemEffectiveTimePeriod.cs b/ShippedItemInstancePlugin/Models/ItemEffectiveTimePeriod.cs
index a184fde..9e190bb 100644
--- a/ShippedItemInstancePlugin/Models/ItemEffectiveTimePeriod.cs
+++ b/ShippedItemInstancePlugin/Models/ItemEffectiveTimePeriod.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ItemId.cs b/ShippedItemInstancePlugin/Models/ItemId.cs
index ea6f251..7c351df 100644
--- a/ShippedItemInstancePlugin/Models/ItemId.cs
+++ b/ShippedItemInstancePlugin/Models/ItemId.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ItemItemTreatment.cs b/ShippedItemInstancePlugin/Models/ItemItemTreatment.cs
index 33f7b09..edce83f 100644
--- a/ShippedItemInstancePlugin/Models/ItemItemTreatment.cs
+++ b/ShippedItemInstancePlugin/Models/ItemItemTreatment.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ItemItemTreatmentId.cs b/ShippedItemInstancePlugin/Models/ItemItemTreatmentId.cs
index afa37d6..da7968c 100644
--- a/ShippedItemInstancePlugin/Models/ItemItemTreatmentId.cs
+++ b/ShippedItemInstancePlugin/Models/ItemItemTreatmentId.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ItemItemTreatmentRegistrationStatus.cs b/ShippedItemInstancePlugin/Models/ItemItemTreatmentRegistrationStatus.cs
index 69cd290..95a52a7 100644
--- a/ShippedItemInstancePlugin/Models/ItemItemTreatmentRegistrationStatus.cs
+++ b/ShippedItemInstancePlugin/Models/ItemItemTreatmentRegistrationStatus.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ItemItemTreatmentSubstance.cs b/ShippedItemInstancePlugin/Models/ItemItemTreatmentSubstance.cs
index 7ba7920..792d46b 100644
--- a/ShippedItemInstancePlugin/Models/ItemItemTreatmentSubstance.cs
+++ b/ShippedItemInstancePlugin/Models/ItemItemTreatmentSubstance.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ItemManufacturerItemIdentification.cs b/ShippedItemInstancePlugin/Models/ItemManufacturerItemIdentification.cs
index 5602695..5ecd41c 100644
--- a/ShippedItemInstancePlugin/Models/ItemManufacturerItemIdentification.cs
+++ b/ShippedItemInstancePlugin/Models/ItemManufacturerItemIdentification.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ItemManufacturingParty.cs b/ShippedItemInstancePlugin/Models/ItemManufacturingParty.cs
index 68f59e0..05a4ee9 100644
--- a/ShippedItemInstancePlugin/Models/ItemManufacturingParty.cs
+++ b/ShippedItemInstancePlugin/Models/ItemManufacturingParty.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ItemPackaging.cs b/ShippedItemInstancePlugin/Models/ItemPackaging.cs
index 60060c2..7e7d7df 100644
--- a/ShippedItemInstancePlugin/Models/ItemPackaging.cs
+++ b/ShippedItemInstancePlugin/Models/ItemPackaging.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ItemPackagingPerPackageQuantity.cs b/ShippedItemInstancePlugin/Models/ItemPackagingPerPackageQuantity.cs
index aad8500..a953343 100644
--- a/ShippedItemInstancePlugin/Models/ItemPackagingPerPackageQuantity.cs
+++ b/ShippedItemInstancePlugin/Models/ItemPackagingPerPackageQuantity.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ItemRegistrationStatus.cs b/ShippedItemInstancePlugin/Models/ItemRegistrationStatus.cs
index 5511225..09c283d 100644
--- a/ShippedItemInstancePlugin/Models/ItemRegistrationStatus.cs
+++ b/ShippedItemInstancePlugin/Models/ItemRegistrationStatus.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ItemSubstance.cs b/ShippedItemInstancePlugin/Models/ItemSubstance.cs
index 7dfbd44..57697b4 100644
--- a/ShippedItemInstancePlugin/Models/ItemSubstance.cs
+++ b/ShippedItemInstancePlugin/Models/ItemSubstance.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/Measurement.cs b/ShippedItemInstancePlugin/Models/Measurement.cs
index 847f657..ed864ea 100644
--- a/ShippedItemInstancePlugin/Models/Measurement.cs
+++ b/ShippedItemInstancePlugin/Models/Measurement.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/MeasurementList.cs b/ShippedItemInstancePlugin/Models/MeasurementList.cs
index 0a3831f..46d4cb5 100644
--- a/ShippedItemInstancePlugin/Models/MeasurementList.cs
+++ b/ShippedItemInstancePlugin/Models/MeasurementList.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
@@ -69,7 +69,7 @@ public bool Equals(MeasurementList other)
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
 
-            return false && base.Equals(other);
+            return false;
         }
 
         /// <summary>
diff --git a/ShippedItemInstancePlugin/Models/RelatedId.cs b/ShippedItemInstancePlugin/Models/RelatedId.cs
index 7f0c1a5..d6af08a 100644
--- a/ShippedItemInstancePlugin/Models/RelatedId.cs
+++ b/ShippedItemInstancePlugin/Models/RelatedId.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/RelatedIdList.cs b/ShippedItemInstancePlugin/Models/RelatedIdList.cs
index b824941..6adc03d 100644
--- a/ShippedItemInstancePlugin/Models/RelatedIdList.cs
+++ b/ShippedItemInstancePlugin/Models/RelatedIdList.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
@@ -69,7 +69,7 @@ public bool Equals(RelatedIdList other)
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
 
-            return false && base.Equals(other);
+            return false;
         }
 
         /// <summary>
diff --git a/ShippedItemInstancePlugin/Models/Results.cs b/ShippedItemInstancePlugin/Models/Results.cs
index d18eef1..286bdfa 100644
--- a/ShippedItemInstancePlugin/Models/Results.cs
+++ b/ShippedItemInstancePlugin/Models/Results.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ResultsQuantitative.cs b/ShippedItemInstancePlugin/Models/ResultsQuantitative.cs
index d7b3df6..b8b64cd 100644
--- a/ShippedItemInstancePlugin/Models/ResultsQuantitative.cs
+++ b/ShippedItemInstancePlugin/Models/ResultsQuantitative.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShipFromParty.cs b/ShippedItemInstancePlugin/Models/ShipFromParty.cs
index e429ce6..c46f21d 100644
--- a/ShippedItemInstancePlugin/Models/ShipFromParty.cs
+++ b/ShippedItemInstancePlugin/Models/ShipFromParty.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
@@ -47,6 +47,13 @@ public partial class ShipFromParty : IEquatable<ShipFromParty>
         [DataMember(Name="name")]
         public string Name { get; set; }
 
+        /// <summary>
+        /// Gets or Sets AccountId
+        /// </summary>
+
+        [DataMember(Name="accountId")]
+        public string AccountId { get; set; }
+
         /// <summary>
         /// Gets or Sets Location
         /// </summary>
@@ -65,6 +72,7 @@ public override string ToString()
             sb.Append("  TypeCode: ").Append(TypeCode).Append("\n");
             sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  AccountId: ").Append(AccountId).Append("\n");
             sb.Append("  Location: ").Append(Location).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -117,6 +125,11 @@ public bool Equals(ShipFromParty other)
                     Name != null &&
                     Name.Equals(other.Name)
                 ) && 
+                (
+                    AccountId == other.AccountId ||
+                    AccountId != null &&
+                    AccountId.Equals(other.AccountId)
+                ) && 
                 (
                     Location == other.Location ||
                     Location != null &&
@@ -140,6 +153,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + Id.GetHashCode();
                     if (Name != null)
                     hashCode = hashCode * 59 + Name.GetHashCode();
+                    if (AccountId != null)
+                    hashCode = hashCode * 59 + AccountId.GetHashCode();
                     if (Location != null)
                     hashCode = hashCode * 59 + Location.GetHashCode();
                 return hashCode;
diff --git a/ShippedItemInstancePlugin/Models/ShipFromPartyLocation.cs b/ShippedItemInstancePlugin/Models/ShipFromPartyLocation.cs
index 2517a79..9e48654 100644
--- a/ShippedItemInstancePlugin/Models/ShipFromPartyLocation.cs
+++ b/ShippedItemInstancePlugin/Models/ShipFromPartyLocation.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShipToParty.cs b/ShippedItemInstancePlugin/Models/ShipToParty.cs
index 894178f..1ee9e24 100644
--- a/ShippedItemInstancePlugin/Models/ShipToParty.cs
+++ b/ShippedItemInstancePlugin/Models/ShipToParty.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
@@ -33,6 +33,13 @@ public partial class ShipToParty : IEquatable<ShipToParty>
         [DataMember(Name="typeCode")]
         public string TypeCode { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Id
+        /// </summary>
+
+        [DataMember(Name="id")]
+        public string Id { get; set; }
+
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
@@ -63,6 +70,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class ShipToParty {\n");
             sb.Append("  TypeCode: ").Append(TypeCode).Append("\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  AccountId: ").Append(AccountId).Append("\n");
             sb.Append("  Location: ").Append(Location).Append("\n");
@@ -107,6 +115,11 @@ public bool Equals(ShipToParty other)
                     TypeCode != null &&
                     TypeCode.Equals(other.TypeCode)
                 ) && 
+                (
+                    Id == other.Id ||
+                    Id != null &&
+                    Id.Equals(other.Id)
+                ) && 
                 (
                     Name == other.Name ||
                     Name != null &&
@@ -136,6 +149,8 @@ public override int GetHashCode()
                 // Suitable nullity checks etc, of course :)
                     if (TypeCode != null)
                     hashCode = hashCode * 59 + TypeCode.GetHashCode();
+                    if (Id != null)
+                    hashCode = hashCode * 59 + Id.GetHashCode();
                     if (Name != null)
                     hashCode = hashCode * 59 + Name.GetHashCode();
                     if (AccountId != null)
diff --git a/ShippedItemInstancePlugin/Models/ShipToPartyLocation.cs b/ShippedItemInstancePlugin/Models/ShipToPartyLocation.cs
index b310d16..25bccdb 100644
--- a/ShippedItemInstancePlugin/Models/ShipToPartyLocation.cs
+++ b/ShippedItemInstancePlugin/Models/ShipToPartyLocation.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShipToPartyLocationAddress.cs b/ShippedItemInstancePlugin/Models/ShipToPartyLocationAddress.cs
index 1256ef1..f04830d 100644
--- a/ShippedItemInstancePlugin/Models/ShipToPartyLocationAddress.cs
+++ b/ShippedItemInstancePlugin/Models/ShipToPartyLocationAddress.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShipToPartyLocationAddressCountrySubDivisionCode.cs b/ShippedItemInstancePlugin/Models/ShipToPartyLocationAddressCountrySubDivisionCode.cs
index d3642d9..201d2e6 100644
--- a/ShippedItemInstancePlugin/Models/ShipToPartyLocationAddressCountrySubDivisionCode.cs
+++ b/ShippedItemInstancePlugin/Models/ShipToPartyLocationAddressCountrySubDivisionCode.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShipmentReference.cs b/ShippedItemInstancePlugin/Models/ShipmentReference.cs
index 842796e..c4d83bf 100644
--- a/ShippedItemInstancePlugin/Models/ShipmentReference.cs
+++ b/ShippedItemInstancePlugin/Models/ShipmentReference.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
@@ -33,6 +33,20 @@ public partial class ShipmentReference : IEquatable<ShipmentReference>
         [DataMember(Name="id")]
         public string Id { get; set; }
 
+        /// <summary>
+        /// Gets or Sets TypeCode
+        /// </summary>
+
+        [DataMember(Name="typeCode")]
+        public string TypeCode { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Note
+        /// </summary>
+
+        [DataMember(Name="note")]
+        public string Note { get; set; }
+
         /// <summary>
         /// Gets or Sets Status
         /// </summary>
@@ -140,6 +154,8 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class ShipmentReference {\n");
             sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  TypeCode: ").Append(TypeCode).Append("\n");
+            sb.Append("  Note: ").Append(Note).Append("\n");
             sb.Append("  Status: ").Append(Status).Append("\n");
             sb.Append("  LineNumberId: ").Append(LineNumberId).Append("\n");
             sb.Append("  ShipUnitReference: ").Append(ShipUnitReference).Append("\n");
@@ -195,6 +211,16 @@ public bool Equals(ShipmentReference other)
                     Id != null &&
                     Id.Equals(other.Id)
                 ) && 
+                (
+                    TypeCode == other.TypeCode ||
+                    TypeCode != null &&
+                    TypeCode.Equals(other.TypeCode)
+                ) && 
+                (
+                    Note == other.Note ||
+                    Note != null &&
+                    Note.Equals(other.Note)
+                ) && 
                 (
                     Status == other.Status ||
                     Status != null &&
@@ -279,6 +305,10 @@ public override int GetHashCode()
                 // Suitable nullity checks etc, of course :)
                     if (Id != null)
                     hashCode = hashCode * 59 + Id.GetHashCode();
+                    if (TypeCode != null)
+                    hashCode = hashCode * 59 + TypeCode.GetHashCode();
+                    if (Note != null)
+                    hashCode = hashCode * 59 + Note.GetHashCode();
                     if (Status != null)
                     hashCode = hashCode * 59 + Status.GetHashCode();
                     if (LineNumberId != null)
diff --git a/ShippedItemInstancePlugin/Models/ShipmentReferenceDeliveredQuantity.cs b/ShippedItemInstancePlugin/Models/ShipmentReferenceDeliveredQuantity.cs
index 0327088..58e65ed 100644
--- a/ShippedItemInstancePlugin/Models/ShipmentReferenceDeliveredQuantity.cs
+++ b/ShippedItemInstancePlugin/Models/ShipmentReferenceDeliveredQuantity.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShipmentReferenceListRequest.cs b/ShippedItemInstancePlugin/Models/ShipmentReferenceListRequest.cs
index 091a5cd..b2d4a8c 100644
--- a/ShippedItemInstancePlugin/Models/ShipmentReferenceListRequest.cs
+++ b/ShippedItemInstancePlugin/Models/ShipmentReferenceListRequest.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
@@ -69,7 +69,7 @@ public bool Equals(ShipmentReferenceListRequest other)
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
 
-            return false && base.Equals(other);
+            return false;
         }
 
         /// <summary>
diff --git a/ShippedItemInstancePlugin/Models/ShipmentReferenceListRequestEntry.cs b/ShippedItemInstancePlugin/Models/ShipmentReferenceListRequestEntry.cs
index f4e3da2..00e5c08 100644
--- a/ShippedItemInstancePlugin/Models/ShipmentReferenceListRequestEntry.cs
+++ b/ShippedItemInstancePlugin/Models/ShipmentReferenceListRequestEntry.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShipmentReferenceListResponse.cs b/ShippedItemInstancePlugin/Models/ShipmentReferenceListResponse.cs
index ebd3364..c847b57 100644
--- a/ShippedItemInstancePlugin/Models/ShipmentReferenceListResponse.cs
+++ b/ShippedItemInstancePlugin/Models/ShipmentReferenceListResponse.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
@@ -69,7 +69,7 @@ public bool Equals(ShipmentReferenceListResponse other)
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
 
-            return false && base.Equals(other);
+            return false;
         }
 
         /// <summary>
diff --git a/ShippedItemInstancePlugin/Models/ShipmentReferenceListResponseEntry.cs b/ShippedItemInstancePlugin/Models/ShipmentReferenceListResponseEntry.cs
index 6dcadbc..c3c5861 100644
--- a/ShippedItemInstancePlugin/Models/ShipmentReferenceListResponseEntry.cs
+++ b/ShippedItemInstancePlugin/Models/ShipmentReferenceListResponseEntry.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShipmentReferenceShipUnitReference.cs b/ShippedItemInstancePlugin/Models/ShipmentReferenceShipUnitReference.cs
index 765e356..95e48d4 100644
--- a/ShippedItemInstancePlugin/Models/ShipmentReferenceShipUnitReference.cs
+++ b/ShippedItemInstancePlugin/Models/ShipmentReferenceShipUnitReference.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShipmentReferenceShipUnitReferenceId.cs b/ShippedItemInstancePlugin/Models/ShipmentReferenceShipUnitReferenceId.cs
index 62dde9e..bfaed09 100644
--- a/ShippedItemInstancePlugin/Models/ShipmentReferenceShipUnitReferenceId.cs
+++ b/ShippedItemInstancePlugin/Models/ShipmentReferenceShipUnitReferenceId.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShipmentReferenceStatus.cs b/ShippedItemInstancePlugin/Models/ShipmentReferenceStatus.cs
index 4cb384f..5bcd84b 100644
--- a/ShippedItemInstancePlugin/Models/ShipmentReferenceStatus.cs
+++ b/ShippedItemInstancePlugin/Models/ShipmentReferenceStatus.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShippedItemInstance.cs b/ShippedItemInstancePlugin/Models/ShippedItemInstance.cs
index 8b2723a..080ad7a 100644
--- a/ShippedItemInstancePlugin/Models/ShippedItemInstance.cs
+++ b/ShippedItemInstancePlugin/Models/ShippedItemInstance.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShippedItemInstanceList.cs b/ShippedItemInstancePlugin/Models/ShippedItemInstanceList.cs
index b379e46..25d5f96 100644
--- a/ShippedItemInstancePlugin/Models/ShippedItemInstanceList.cs
+++ b/ShippedItemInstancePlugin/Models/ShippedItemInstanceList.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
@@ -69,7 +69,7 @@ public bool Equals(ShippedItemInstanceList other)
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
 
-            return false && base.Equals(other);
+            return false;
         }
 
         /// <summary>
diff --git a/ShippedItemInstancePlugin/Models/ShippedItemInstanceLot.cs b/ShippedItemInstancePlugin/Models/ShippedItemInstanceLot.cs
index 3c00f2e..1677990 100644
--- a/ShippedItemInstancePlugin/Models/ShippedItemInstanceLot.cs
+++ b/ShippedItemInstancePlugin/Models/ShippedItemInstanceLot.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShippedItemInstancePackaging.cs b/ShippedItemInstancePlugin/Models/ShippedItemInstancePackaging.cs
index deb1664..4b66598 100644
--- a/ShippedItemInstancePlugin/Models/ShippedItemInstancePackaging.cs
+++ b/ShippedItemInstancePlugin/Models/ShippedItemInstancePackaging.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShippedItemInstancePackagingQuantity.cs b/ShippedItemInstancePlugin/Models/ShippedItemInstancePackagingQuantity.cs
index ed5bc45..8b7d11c 100644
--- a/ShippedItemInstancePlugin/Models/ShippedItemInstancePackagingQuantity.cs
+++ b/ShippedItemInstancePlugin/Models/ShippedItemInstancePackagingQuantity.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
diff --git a/ShippedItemInstancePlugin/Models/ShippedItemInstanceQuantity.cs b/ShippedItemInstancePlugin/Models/ShippedItemInstanceQuantity.cs
index 582d469..30f898a 100644
--- a/ShippedItemInstancePlugin/Models/ShippedItemInstanceQuantity.cs
+++ b/ShippedItemInstancePlugin/Models/ShippedItemInstanceQuantity.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
@@ -41,6 +41,13 @@ public partial class ShippedItemInstanceQuantity : IEquatable<ShippedItemInstanc
         [DataMember(Name="unitCode")]
         public string UnitCode { get; set; }
 
+        /// <summary>
+        /// Gets or Sets TypeCode
+        /// </summary>
+
+        [DataMember(Name="typeCode")]
+        public string TypeCode { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -51,6 +58,7 @@ public override string ToString()
             sb.Append("class ShippedItemInstanceQuantity {\n");
             sb.Append("  Content: ").Append(Content).Append("\n");
             sb.Append("  UnitCode: ").Append(UnitCode).Append("\n");
+            sb.Append("  TypeCode: ").Append(TypeCode).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -96,6 +104,11 @@ public bool Equals(ShippedItemInstanceQuantity other)
                     UnitCode == other.UnitCode ||
                     UnitCode != null &&
                     UnitCode.Equals(other.UnitCode)
+                ) && 
+                (
+                    TypeCode == other.TypeCode ||
+                    TypeCode != null &&
+                    TypeCode.Equals(other.TypeCode)
                 );
         }
 
@@ -113,6 +126,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + Content.GetHashCode();
                     if (UnitCode != null)
                     hashCode = hashCode * 59 + UnitCode.GetHashCode();
+                    if (TypeCode != null)
+                    hashCode = hashCode * 59 + TypeCode.GetHashCode();
                 return hashCode;
             }
         }
diff --git a/ShippedItemInstancePlugin/Models/ShippedItemInstanceUid.cs b/ShippedItemInstancePlugin/Models/ShippedItemInstanceUid.cs
index 874d4e9..b1211b7 100644
--- a/ShippedItemInstancePlugin/Models/ShippedItemInstanceUid.cs
+++ b/ShippedItemInstancePlugin/Models/ShippedItemInstanceUid.cs
@@ -1,9 +1,9 @@
 /*
  * AgGateway In-Field Product Id
  *
- * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.   
+ * Allows the Retailer to send information about the actual product shipped to the Farmer, including shipment identifer, product identifiers, seed lot id, mixture batch id, seed treatment and product composition.  Allows the Farmer (via a mobile application or FMIS), or the Farmer's equipment manufacturer application (aka OEM Platform, e.g., Deere Operations Center, AGCO Fuse, CNH AFS, etc.) to retrieve the Product shipped by a Retailer using GET /setupfiles.    V4.1 Allows shipments from the farm to the retailer/ elevator / processor as these roles are reversed as the shipFromParty is the farmer and shipToParty is the commodity processor or elevator for storage.  This improves the process for receipts at the elevator.  
  *
- * OpenAPI spec version: V4
+ * OpenAPI spec version: V4.1
  * Contact: wg01@aggateway.org
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */