diff --git a/Components/Components.csproj b/Components/Components.csproj
index 0d40f5d..7bf76a5 100644
--- a/Components/Components.csproj
+++ b/Components/Components.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TM.TransSmart.Components</RootNamespace>
     <AssemblyName>TM.TransSmart.Components</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Components/Properties/AssemblyInfo.cs b/Components/Properties/AssemblyInfo.cs
index bc09faf..ab0da84 100644
--- a/Components/Properties/AssemblyInfo.cs
+++ b/Components/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Deployment/Deployment.btdfproj b/Deployment/Deployment.btdfproj
index f64ab6f..7644d2f 100644
--- a/Deployment/Deployment.btdfproj
+++ b/Deployment/Deployment.btdfproj
@@ -16,7 +16,7 @@
     <SsoAppUserGroup>KLG\BizTalk SSO Administrators_$(BTDFENV)</SsoAppUserGroup>
     <!-- End Customization -->
     <SchemaVersion>1.0</SchemaVersion>
-    <ProjectName>TM.TransSmart</ProjectName>
+    <ProjectName>KLG.Extern</ProjectName>
     <ProjectVersion>1.0</ProjectVersion>
     <SkipIISReset>True</SkipIISReset>
     <SkipHostInstancesRestart>True</SkipHostInstancesRestart>
@@ -56,7 +56,7 @@
     <!--     1) Increment ProductVersion -->
     <!--     2) Generate a new GUID and update ProductId with the new GUID -->
     <!--   This allows the new MSI to automatically uninstall (not undeploy!) the old MSI and install the new one. -->
-    <ProductVersion>1.0.33</ProductVersion>
+    <ProductVersion>3.0.33</ProductVersion>
     <ProductId>6c62c5e2-4df2-4daf-b556-9a4d9bdea470</ProductId>
     <!-- BizTalk App Version Upgrade -->
     <ProductName>TM.TransSmart</ProductName>
@@ -89,15 +89,12 @@
   </PropertyGroup>
   <ItemGroup>
     <PropsFromEnvSettings Include="SsoAppUserGroup;SsoAppAdminGroup;ESBLookupConnectionString;ESBTrackingConnectionString;B2BUsername;B2BPassword" />
-    <AppsToReference Include="TM.Shared.Pipelines" />
-    <AppsToReference Include="TM.Shared.Schemas" />
-    <AppsToReference Include="TM.Shared.Schemas_v19A" />
-    <AppsToReference Include="TM.Shared.PipelineComponents" />
+    <AppsToReference Include="KLG.Intern"/>
   </ItemGroup>
   <!-- !!! TODO !!! -->
   <!-- Add ItemGroup elements that contain one or more Schemas, Orchestrations, Transforms, etc. elements that describe -->
   <!-- the specific artifacts in your solution that need to be deployed. Use IntelliSense as a guide. -->
-  <ItemGroup>
+  <!--<ItemGroup>
     <Schemas Include="TM.TransSmart.Schemas.dll">
       <LocationPath>..\Schemas\bin\$(Configuration)</LocationPath>
     </Schemas>
@@ -113,16 +110,60 @@
     <Components Include="TM.TransSmart.Components.dll">
       <LocationPath>..\Components\bin\$(Configuration)</LocationPath>
     </Components>
-  </ItemGroup>
+  </ItemGroup>-->
   <!-- !!! TODO !!! -->
   <Import Project="$(DeploymentFrameworkTargetsPath)BizTalkDeploymentFramework.targets" />
-  <Import Project="$(BTDFEXTENSIONPATH)\Targets\1.0.0.\Custom.BizTalkDeploymentFramework.targets" />
+  <!-- ============ START Deployment OVERRIDE ============ -->
+  <Import Project="$(BTDFEXTENSIONPATH)\Targets\1.0.0\Custom.BizTalkDeploymentFramework.targets"/>
+  <Import Project="$(DeploymentFrameworkTargetsPath)BizTalkDeploymentFramework.Redeploy.targets"/>
   <!--
     The Deployment Framework automatically packages most files into the server install MSI.
     However, if there are special folders that you need to include in the MSI, you can
     copy them to the folder $(RedistDir) in the CustomRedist target.
     To include individual files, add an ItemGroup with AdditionalFiles elements.
   -->
-  <Target Name="CustomRedist">
+  <Target Name="UndeployAppDefinition" Condition="'$(SkipUndeploy)' == 'false'" DependsOnTargets="PrepareAppForUndeploy">
+    <Message Text="-&gt; Override UndeployAppDefinition (no application removal is done!)"/>
+    <!--<Exec Command="BTSTask.exe RemoveResource -ApplicationName:&quot;$(BizTalkAppName)&quot; -Luid:&quot;$(ProductName).Components, Version=3.0.1.0, Culture=neutral, PublicKeyToken=$(ProductPublicKey)&quot;" Condition="'$(AppExists)' == 'true'" ContinueOnError="true"/>-->
+    <!--<Exec Command="BTSTask.exe RemoveResource -ApplicationName:&quot;$(BizTalkAppName)&quot; -Luid:&quot;$(ProductName).PipelineComponents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=$(ProductPublicKey)&quot;" Condition="'$(AppExists)' == 'true'" ContinueOnError="true"/>-->
+    <Exec Command="BTSTask.exe RemoveResource -ApplicationName:&quot;$(BizTalkAppName)&quot; -Luid:&quot;$(ProductName).Pipelines, Version=3.0.3.0, Culture=neutral, PublicKeyToken=$(ProductPublicKey)&quot;" Condition="'$(AppExists)' == 'true'" ContinueOnError="true"/>
+    <Exec Command="BTSTask.exe RemoveResource -ApplicationName:&quot;$(BizTalkAppName)&quot; -Luid:&quot;$(ProductName).Schemas, Version=3.0.0.0, Culture=neutral, PublicKeyToken=$(ProductPublicKey)&quot;" Condition="'$(AppExists)' == 'true'" ContinueOnError="true"/>
+    <Exec Command="BTSTask.exe RemoveResource -ApplicationName:&quot;$(BizTalkAppName)&quot; -Luid:&quot;$(ProductName).Transforms, Version=3.0.21.0, Culture=neutral, PublicKeyToken=$(ProductPublicKey)&quot;" Condition="'$(AppExists)' == 'true'" ContinueOnError="true"/>
+  </Target>
+  <Target Name="StopApplication" DependsOnTargets="VerifyBizTalkAppExists">
+    <Message Text="-&gt; Override StopApplication"/>
+    <!--Stop Orchestrations-->
+    <!--<ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="Stop" SendPortName="" ReceivePortName="" OrchestrationName="OrchestrationExample" Condition="'$(AppExists)' == 'true'"/>-->
+    <!--Stop Send Ports (optional remove mapping)-->
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="Stop" SendPortName="TM.TransSmart: TM.Shared.OrderStatus_to_TM.TransSmart.Status Send" ReceivePortName="" OrchestrationName="" Condition="'$(AppExists)' == 'true'"/>
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="Stop" SendPortName="TM.TransSmart: ToXMLDOC_IN" ReceivePortName="" OrchestrationName="" Condition="'$(AppExists)' == 'true'"/>
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="RemoveOutboundTransformFromSendPort" SendPortName="TM.TransSmart: TM.Shared.OrderStatus_to_TM.TransSmart.Status Send" ReceivePortName="" OrchestrationName="" TransformName="TM.Shared.OrderStatus_to_TM_TransSmart_Status" Condition="'$(AppExists)' == 'true'"/>
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="RemoveOutboundTransformFromSendPort" SendPortName="TM.TransSmart: TM.Shared.OrderStatus_to_TM.TransSmart.Status Send" ReceivePortName="" OrchestrationName="" TransformName="TM.TransSmart.Shipment_to_TM.Shared_Order" Condition="'$(AppExists)' == 'true'"/>
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="RemoveOutboundTransformFromSendPort" SendPortName="TM.TransSmart: ToXMLDOC_IN" ReceivePortName="" OrchestrationName="" TransformName="TM.Shared.OrderStatus_to_TM_TransSmart_Status" Condition="'$(AppExists)' == 'true'"/>
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="RemoveOutboundTransformFromSendPort" SendPortName="TM.TransSmart: ToXMLDOC_IN" ReceivePortName="" OrchestrationName="" TransformName="TM.TransSmart.Shipment_to_TM.Shared_Order" Condition="'$(AppExists)' == 'true'"/>
+    <!--Stop Receive Ports (optional remove mapping)-->
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="Stop" SendPortName="" ReceivePortName="TM.TransSmart: TM.TransSmart.Shipment_to_TM.Shared.Order" OrchestrationName="" Condition="'$(AppExists)' == 'true'"/>
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="Stop" SendPortName="" ReceivePortName="TM.TransSmart: TM.Shared.OrderStatus_to_TM.TransSmart.Status" OrchestrationName="" Condition="'$(AppExists)' == 'true'"/>
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="RemoveInboundTransformFromReceivePort" SendPortName="" ReceivePortName="TM.TransSmart: TM.TransSmart.Shipment_to_TM.Shared.Order" OrchestrationName="" TransformName="TM.Shared.OrderStatus_to_TM_TransSmart_Status" Condition="'$(AppExists)' == 'true'"/>
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="RemoveInboundTransformFromReceivePort" SendPortName="" ReceivePortName="TM.TransSmart: TM.TransSmart.Shipment_to_TM.Shared.Order" OrchestrationName="" TransformName="TM.TransSmart.Shipment_to_TM.Shared_Order" Condition="'$(AppExists)' == 'true'"/>
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="RemoveInboundTransformFromReceivePort" SendPortName="" ReceivePortName="TM.TransSmart: TM.Shared.OrderStatus_to_TM.TransSmart.Status" OrchestrationName="" TransformName="TM.Shared.OrderStatus_to_TM_TransSmart_Status" Condition="'$(AppExists)' == 'true'"/>
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="RemoveInboundTransformFromReceivePort" SendPortName="" ReceivePortName="TM.TransSmart: TM.Shared.OrderStatus_to_TM.TransSmart.Status" OrchestrationName="" TransformName="TM.TransSmart.Shipment_to_TM.Shared_Order" Condition="'$(AppExists)' == 'true'"/>
+
+    <!--<ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="Stop" SendPortName="" ReceivePortName="TM.IDS: TM.IDS.Shipment_to_TM.Shared.Order" OrchestrationName="" Condition="'$(AppExists)' == 'true'"/>-->
+
+  </Target>
+  <Target Name="StartApplication" Condition="'$(StartApplicationOnDeploy)' == 'true'">
+    <Message Text="-&gt; Override StartApplication"/>
+    <Message Text="Starting $(BizTalkAppName) application at $(StartApplicationTime)."/>
+    <Message Text="Note: Starting the app may take 5-10 secs PER ORCHESTRATION. Please wait..."/>
+    <!--Start Send Ports-->
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="Start" SendPortName="TM.TransSmart: TM.Shared.OrderStatus_to_TM.TransSmart.Status Send" ReceivePortName="" OrchestrationName="" Condition="'$(AppExists)' == 'true'"/>
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="Start" SendPortName="TM.TransSmart: ToXMLDOC_IN" ReceivePortName="" OrchestrationName="" Condition="'$(AppExists)' == 'true'"/>
+    <!--Start Receive Ports-->
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="Start" SendPortName="" ReceivePortName="TM.TransSmart: TM.TransSmart.Shipment_to_TM.Shared.Order" OrchestrationName="" Condition="'$(AppExists)' == 'true'"/>
+    <ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="Start" SendPortName="" ReceivePortName="TM.TransSmart: TM.Shared.OrderStatus_to_TM.TransSmart.Status" OrchestrationName="" Condition="'$(AppExists)' == 'true'"/>
+    <!--Start Orchestrations-->
+    <!--<ControlBizTalkArtefacts ApplicationName="$(BizTalkAppName)" Command="Start" SendPortName="" ReceivePortName="" OrchestrationName="OrchestrationExample" Condition="'$(AppExists)' == 'true'"/>-->
   </Target>
+  <!-- ============ END Deployment OVERRIDE ============ -->
 </Project>
\ No newline at end of file
diff --git a/Deployment/EnvironmentSettings/DEV.xml b/Deployment/EnvironmentSettings/DEV.xml
new file mode 100644
index 0000000..7026646
--- /dev/null
+++ b/Deployment/EnvironmentSettings/DEV.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--User tdradmin called GetEnvironmentSettingsTasks for integration KLG.Extern with version : 3.0.33 (ProductId:6c62c5e2-4df2-4daf-b556-9a4d9bdea470) (ProductUpgradeCode3716585f-6a4c-419e-a5c0-867ba4af9b00) on date: 12/13/2024 11:55:48-->
+<settings>
+  <property name="TM.TransSmart: TM.TransSmart.Shipment_to_TM.Shared.Order">D:\ESB\KLG.TM\TransSmart\From\Shipments\*.xml</property>
+  <property name="TM.TransSmart: TM.Shared.OrderStatus_to_TM.TransSmart.Status">D:\ESB\KLG.TM\TransSmart\From\OrderStatus\%MessageID%.xml</property>
+  <property name="TM.TransSmart: TM.Shared.OrderStatus_to_TM.TransSmart.Status Send">D:\ESB\KLG.TM\TransSmart\To\OrderStatus\%MessageID%.xml</property>
+  <property name="SsoAppUserGroup" Default="true">KLG\BizTalk SSO Administrators_DEV</property>
+  <property name="SsoAppAdminGroup" Default="true">KLG\BizTalk SSO Administrators_DEV</property>
+  <property name="ESBTrackingConnectionString" Default="true">Data Source=NLDC1-BTSSQLE01;Initial Catalog=ESBTrackingDEV;Integrated Security=SSPI;</property>
+  <property name="ESBLookupConnectionString" Default="true">Provider=SQLOLEDB.1;Data Source=vmBizTalkTST\ESB;Initial Catalog=ESBLookups;Integrated Security=SSPI;</property>
+  <property name="B2BUsername" Default="true"></property>
+  <property name="B2BPassword" Default="true"></property>
+  <property name="CustomerPortalLookupConnectionString" Default="true">Provider=SQLOLEDB.1;Data Source=VMSQL1VENLO\Others;Initial Catalog=CustomerPortal;Integrated Security=SSPI;</property>
+  <property name="TESTUsernameAzure" Default="true"></property>
+  <property name="TM.Shared.Schemas: Latest Version" Default="true">v19A</property>
+  <property name="TM.Shared.Pipelines: Version" Default="true">2.0.1.0</property>
+  <property name="Csharp_ESBLookupConnectionString" Default="true">Data Source=vmBizTalkTST\ESB;Initial Catalog=ESBLookups;Integrated Security=SSPI;</property>
+  <property name="Service Account" Default="true"></property>
+  <property name="Service Account Password" Default="true"></property>
+  <property name="TESTusernameSFTP" Default="true"></property>
+  <property name="TM.Shared.Application: DebugLevel" Default="true">ALL</property>
+  <property name="EmailFromEnvironment" Default="true">EDI_DEV@klgeurope.com</property>
+  <property name="Environment" Default="true">DEV</property>
+  <property name="TM.Shared: XMLDOC_IN" Default="true">D:\ESB\KLG.TM\Shared\XMLDOC\IN\%MessageID%.xml</property>
+  <property name="SQL Server" Default="true">VMBIZTALKTST/ESB</property>
+  <property name="svc_bts_edi_fs_pw" Default="true"></property>
+  <property name="svc_bts_edi_fs_user" Default="true"></property>
+  <property name="TM.Shared.PipelinesDoc: Latest Version" Default="true">1.0.0.0</property>
+  <property name="SsoAppAdmin2016" Default="true">KLG\BTS-SSO-Admins-DEV</property>
+  <property name="TM.Shared.Pipelines: Version2016" Default="true">3.0.1.0</property>
+  <property name="ESBLookupConnectionString2016" Default="true">Provider=SQLOLEDB.1;Data Source=nlDC1-BtsTST01\ESB;Initial Catalog=ESBLookups;Integrated Security=SSPI;</property>
+  <property name="Csharp_ESBLookupConnectionString2016" Default="true">Data Source=NLDC1-BTSTST01\ESB;Initial Catalog=ESBLookups;Integrated Security=SSPI;</property>
+  <property name="ESBLookupConnectionStringMAURICE" Default="true">Provider=SQLOLEDB.1;Data Source=VMSQL3VENLO;Initial Catalog=ESBLookups;Integrated Security=SSPI;</property>
+  <property name="KLG : Thumbprint" Default="true">E73F476956BF0DA8888B1B210EC7CD48861835EF</property>
+  <property name="MachineName" Default="true"></property>
+  <property name="FTP_LogDir" Default="true">D:\LOG\FTP\</property>
+  <property name="SQL Server2016" Default="true">NLDC1-BTSTST01\ESB</property>
+  <property name="X12.ISA15" Default="true">T</property>
+</settings>
\ No newline at end of file
diff --git a/Deployment/EnvironmentSettings/Exported_DevSettings.xml b/Deployment/EnvironmentSettings/Exported_DevSettings.xml
new file mode 100644
index 0000000..9b49c17
--- /dev/null
+++ b/Deployment/EnvironmentSettings/Exported_DevSettings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  This file was auto-generated by the Environment Settings Spreadsheet to XML Exporter (http://envsettingsmanager.codeplex.com).
+
+  Input File: SettingsFileGenerator.xml
+  Created: 12-13-2024 11:55 
+-->
+<settings>
+  <!--Environment: Shared Development-->
+  <property name="SsoAppUserGroup">BizTalk Application Users</property>
+  <property name="SsoAppAdminGroup">BizTalk Server Administrators</property>
+  <property name="ESBLookupConnectionString"></property>
+  <property name="ESBTrackingConnectionString"></property>
+  <property name="B2BUsername"></property>
+  <property name="B2BPassword"></property>
+</settings>
\ No newline at end of file
diff --git a/Deployment/EnvironmentSettings/Exported_LocalSettings.xml b/Deployment/EnvironmentSettings/Exported_LocalSettings.xml
new file mode 100644
index 0000000..6ff2224
--- /dev/null
+++ b/Deployment/EnvironmentSettings/Exported_LocalSettings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  This file was auto-generated by the Environment Settings Spreadsheet to XML Exporter (http://envsettingsmanager.codeplex.com).
+
+  Input File: SettingsFileGenerator.xml
+  Created: 12-13-2024 11:55 
+-->
+<settings>
+  <!--Environment: Local Development-->
+  <property name="SsoAppUserGroup">BizTalk Application Users</property>
+  <property name="SsoAppAdminGroup">BizTalk Server Administrators</property>
+  <property name="ESBLookupConnectionString"></property>
+  <property name="ESBTrackingConnectionString"></property>
+  <property name="B2BUsername"></property>
+  <property name="B2BPassword"></property>
+</settings>
\ No newline at end of file
diff --git a/Deployment/EnvironmentSettings/Exported_ProdSettings.xml b/Deployment/EnvironmentSettings/Exported_ProdSettings.xml
new file mode 100644
index 0000000..c6ac9c7
--- /dev/null
+++ b/Deployment/EnvironmentSettings/Exported_ProdSettings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  This file was auto-generated by the Environment Settings Spreadsheet to XML Exporter (http://envsettingsmanager.codeplex.com).
+
+  Input File: SettingsFileGenerator.xml
+  Created: 12-13-2024 11:55 
+-->
+<settings>
+  <!--Environment: Production-->
+  <property name="SsoAppUserGroup">BizTalk Application Users</property>
+  <property name="SsoAppAdminGroup">BizTalk Server Administrators</property>
+  <property name="ESBLookupConnectionString"></property>
+  <property name="ESBTrackingConnectionString"></property>
+  <property name="B2BUsername"></property>
+  <property name="B2BPassword"></property>
+</settings>
\ No newline at end of file
diff --git a/Deployment/EnvironmentSettings/Exported_TestSettings.xml b/Deployment/EnvironmentSettings/Exported_TestSettings.xml
new file mode 100644
index 0000000..a1f446e
--- /dev/null
+++ b/Deployment/EnvironmentSettings/Exported_TestSettings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  This file was auto-generated by the Environment Settings Spreadsheet to XML Exporter (http://envsettingsmanager.codeplex.com).
+
+  Input File: SettingsFileGenerator.xml
+  Created: 12-13-2024 11:55 
+-->
+<settings>
+  <!--Environment: Test-->
+  <property name="SsoAppUserGroup">BizTalk Application Users</property>
+  <property name="SsoAppAdminGroup">BizTalk Server Administrators</property>
+  <property name="ESBLookupConnectionString"></property>
+  <property name="ESBTrackingConnectionString"></property>
+  <property name="B2BUsername"></property>
+  <property name="B2BPassword"></property>
+</settings>
\ No newline at end of file
diff --git a/Deployment/PortBindings.xml b/Deployment/PortBindings.xml
index fed1c08..c16bdb6 100644
--- a/Deployment/PortBindings.xml
+++ b/Deployment/PortBindings.xml
@@ -5,23 +5,23 @@
     <ModuleRef Name="[Application:TM.TransSmart]" Version="" Culture="" PublicKeyToken="" FullName="[Application:TM.TransSmart], Version=, Culture=, PublicKeyToken=">
       <Services />
       <TrackedSchemas>
-        <Schema FullName="TM.TransSmart.Schemas.Status" RootName="root" AssemblyQualifiedName="TM.TransSmart.Schemas.Status,TM.TransSmart.Schemas, Version=1.0.0.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" AlwaysTrackAllProperties="false">
+        <Schema FullName="TM.TransSmart.Schemas.Status" RootName="root" AssemblyQualifiedName="TM.TransSmart.Schemas.Status,TM.TransSmart.Schemas, Version=3.0.0.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" AlwaysTrackAllProperties="false">
           <TrackedPropertyNames />
         </Schema>
-        <Schema FullName="TM.TransSmart.Schemas.Shipment" RootName="carrierBooking" AssemblyQualifiedName="TM.TransSmart.Schemas.Shipment,TM.TransSmart.Schemas, Version=1.0.0.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" AlwaysTrackAllProperties="false">
+        <Schema FullName="TM.TransSmart.Schemas.Shipment" RootName="carrierBooking" AssemblyQualifiedName="TM.TransSmart.Schemas.Shipment,TM.TransSmart.Schemas, Version=3.0.0.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" AlwaysTrackAllProperties="false">
           <TrackedPropertyNames />
         </Schema>
       </TrackedSchemas>
     </ModuleRef>
-    <ModuleRef Name="TM.TransSmart.Schemas" Version="1.0.0.0" Culture="neutral" PublicKeyToken="089e5464cda5fc95" FullName="TM.TransSmart.Schemas, Version=1.0.0.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95">
+    <ModuleRef Name="TM.TransSmart.Schemas" Version="3.0.0.0" Culture="neutral" PublicKeyToken="089e5464cda5fc95" FullName="TM.TransSmart.Schemas, Version=3.0.0.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95">
       <Services />
       <TrackedSchemas />
     </ModuleRef>
-    <ModuleRef Name="TM.TransSmart.Pipelines" Version="1.0.3.0" Culture="neutral" PublicKeyToken="089e5464cda5fc95" FullName="TM.TransSmart.Pipelines, Version=1.0.3.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95">
+    <ModuleRef Name="TM.TransSmart.Pipelines" Version="3.0.3.0" Culture="neutral" PublicKeyToken="089e5464cda5fc95" FullName="TM.TransSmart.Pipelines, Version=3.0.3.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95">
       <Services />
       <TrackedSchemas />
     </ModuleRef>
-    <ModuleRef Name="TM.TransSmart.Transforms" Version="1.0.21.0" Culture="neutral" PublicKeyToken="089e5464cda5fc95" FullName="TM.TransSmart.Transforms, Version=1.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95">
+    <ModuleRef Name="TM.TransSmart.Transforms" Version="3.0.21.0" Culture="neutral" PublicKeyToken="089e5464cda5fc95" FullName="TM.TransSmart.Transforms, Version=3.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95">
       <Services />
       <TrackedSchemas />
     </ModuleRef>
@@ -29,7 +29,7 @@
   <SendPortCollection>
     <SendPort Name="TM.TransSmart: TM.Shared.OrderStatus_to_TM.TransSmart.Status Send" IsStatic="true" IsTwoWay="false" BindingOption="0">
       <Description xsi:nil="true" />
-      <TransmitPipeline Name="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit" FullyQualifiedName="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit, TM.Shared.Pipelines, Version=2.0.1.0, Culture=neutral, PublicKeyToken=224c7e2c8b50f9df" Type="2" TrackingOption="ServiceStartEnd MessageSendReceive PipelineEvents" Description="" />
+      <TransmitPipeline Name="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit" FullyQualifiedName="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit, TM.Shared.Pipelines, Version=3.0.1.0, Culture=neutral, PublicKeyToken=224c7e2c8b50f9df" Type="2" TrackingOption="None" Description="" />
       <SendPipelineData>&lt;Root&gt;
           &lt;Stages&gt;
             &lt;Stage CategoryId="9d0e4101-4cce-4536-83fa-4a5040674ad6"&gt;
@@ -130,17 +130,17 @@
           &lt;/Group&gt;
         &lt;/Filter&gt;</Filter>
       <Transforms>
-        <Transform FullName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status" AssemblyQualifiedName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status,TM.TransSmart.Transforms, Version=1.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" />
+        <Transform FullName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status" AssemblyQualifiedName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status,TM.TransSmart.Transforms, Version=3.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" />
       </Transforms>
       <OrderedDelivery>false</OrderedDelivery>
       <Priority>5</Priority>
       <StopSendingOnFailure>false</StopSendingOnFailure>
       <RouteFailedMessage>false</RouteFailedMessage>
-      <ApplicationName>TM.TransSmart</ApplicationName>
+      <ApplicationName>KLG.Extern</ApplicationName>
     </SendPort>
     <SendPort Name="TM.TransSmart: ToXMLDOC_IN" IsStatic="true" IsTwoWay="false" BindingOption="0">
       <Description xsi:nil="true" />
-      <TransmitPipeline Name="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit" FullyQualifiedName="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit, TM.Shared.Pipelines, Version=2.0.1.0, Culture=neutral, PublicKeyToken=224c7e2c8b50f9df" Type="2" TrackingOption="ServiceStartEnd MessageSendReceive PipelineEvents" Description="" />
+      <TransmitPipeline Name="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit" FullyQualifiedName="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit, TM.Shared.Pipelines, Version=3.0.1.0, Culture=neutral, PublicKeyToken=224c7e2c8b50f9df" Type="2" TrackingOption="None" Description="" />
       <SendPipelineData>&lt;Root&gt;
           &lt;Stages&gt;
             &lt;Stage CategoryId="9d0e4101-4cce-4536-83fa-4a5040674ad6"&gt;
@@ -235,7 +235,7 @@
       <Priority>5</Priority>
       <StopSendingOnFailure>false</StopSendingOnFailure>
       <RouteFailedMessage>false</RouteFailedMessage>
-      <ApplicationName>TM.TransSmart</ApplicationName>
+      <ApplicationName>KLG.Extern</ApplicationName>
     </SendPort>
   </SendPortCollection>
   <DistributionListCollection />
@@ -270,7 +270,7 @@
               &lt;FileNetFailRetryCount vt="19"&gt;5&lt;/FileNetFailRetryCount&gt;
               &lt;BatchSize vt="19"&gt;20&lt;/BatchSize&gt;
             &lt;/CustomProps&gt;</ReceiveLocationTransportTypeData>
-          <ReceivePipeline Name="TM.TransSmart.Pipelines.Shipments_XMLReceive" FullyQualifiedName="TM.TransSmart.Pipelines.Shipments_XMLReceive, TM.TransSmart.Pipelines, Version=1.0.3.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" Type="1" TrackingOption="None" />
+          <ReceivePipeline Name="TM.TransSmart.Pipelines.Shipments_XMLReceive" FullyQualifiedName="TM.TransSmart.Pipelines.Shipments_XMLReceive, TM.TransSmart.Pipelines, Version=3.0.3.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" Type="1" TrackingOption="None" />
           <ReceivePipelineData>&lt;Root&gt;
               &lt;Stages&gt;
                 &lt;Stage CategoryId="9d0e4103-4cce-4536-83fa-4a5040674ad6"&gt;
@@ -339,10 +339,10 @@
       <Authentication>0</Authentication>
       <Tracking>0</Tracking>
       <Transforms>
-        <Transform FullName="TM.TransSmart.Transforms.TM_TransSmart_Shipment_to_TM_Shared_Order" AssemblyQualifiedName="TM.TransSmart.Transforms.TM_TransSmart_Shipment_to_TM_Shared_Order,TM.TransSmart.Transforms, Version=1.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" />
+        <Transform FullName="TM.TransSmart.Transforms.TM_TransSmart_Shipment_to_TM_Shared_Order" AssemblyQualifiedName="TM.TransSmart.Transforms.TM_TransSmart_Shipment_to_TM_Shared_Order,TM.TransSmart.Transforms, Version=3.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" />
       </Transforms>
       <RouteFailedMessage>false</RouteFailedMessage>
-      <ApplicationName>TM.TransSmart</ApplicationName>
+      <ApplicationName>KLG.Extern</ApplicationName>
     </ReceivePort>
     <ReceivePort Name="TM.TransSmart: TM.Shared.OrderStatus_to_TM.TransSmart.Status" IsTwoWay="false" BindingOption="0">
       <Description xsi:nil="true" />
@@ -372,7 +372,7 @@
               &lt;FileNetFailRetryCount vt="19"&gt;5&lt;/FileNetFailRetryCount&gt;
               &lt;BatchSize vt="19"&gt;20&lt;/BatchSize&gt;
             &lt;/CustomProps&gt;</ReceiveLocationTransportTypeData>
-          <ReceivePipeline Name="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLReceive" FullyQualifiedName="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLReceive, TM.Shared.Pipelines, Version=2.0.1.0, Culture=neutral, PublicKeyToken=224c7e2c8b50f9df" Type="1" TrackingOption="None" Description="" />
+          <ReceivePipeline Name="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLReceive" FullyQualifiedName="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLReceive, TM.Shared.Pipelines, Version=3.0.1.0, Culture=neutral, PublicKeyToken=224c7e2c8b50f9df" Type="1" TrackingOption="None" Description="" />
           <ReceivePipelineData>&lt;Root&gt;
               &lt;Stages&gt;
                 &lt;Stage CategoryId="9d0e4103-4cce-4536-83fa-4a5040674ad6"&gt;
@@ -431,10 +431,10 @@
       <Authentication>0</Authentication>
       <Tracking>0</Tracking>
       <Transforms>
-        <Transform FullName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status" AssemblyQualifiedName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status,TM.TransSmart.Transforms, Version=1.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" />
+        <Transform FullName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status" AssemblyQualifiedName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status,TM.TransSmart.Transforms, Version=3.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" />
       </Transforms>
       <RouteFailedMessage>false</RouteFailedMessage>
-      <ApplicationName>TM.TransSmart</ApplicationName>
+      <ApplicationName>KLG.Extern</ApplicationName>
     </ReceivePort>
   </ReceivePortCollection>
   <PartyCollection xsi:nil="true" />
diff --git a/Deployment/PortBindingsMaster.xml b/Deployment/PortBindingsMaster.xml
index 6c9a264..2eed03b 100644
--- a/Deployment/PortBindingsMaster.xml
+++ b/Deployment/PortBindingsMaster.xml
@@ -5,23 +5,23 @@
     <ModuleRef Name="[Application:TM.TransSmart]" Version="" Culture="" PublicKeyToken="" FullName="[Application:TM.TransSmart], Version=, Culture=, PublicKeyToken=">
       <Services />
       <TrackedSchemas>
-        <Schema FullName="TM.TransSmart.Schemas.Status" RootName="root" AssemblyQualifiedName="TM.TransSmart.Schemas.Status,TM.TransSmart.Schemas, Version=1.0.0.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" AlwaysTrackAllProperties="false">
+        <Schema FullName="TM.TransSmart.Schemas.Status" RootName="root" AssemblyQualifiedName="TM.TransSmart.Schemas.Status,TM.TransSmart.Schemas, Version=3.0.0.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" AlwaysTrackAllProperties="false">
           <TrackedPropertyNames />
         </Schema>
-        <Schema FullName="TM.TransSmart.Schemas.Shipment" RootName="carrierBooking" AssemblyQualifiedName="TM.TransSmart.Schemas.Shipment,TM.TransSmart.Schemas, Version=1.0.0.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" AlwaysTrackAllProperties="false">
+        <Schema FullName="TM.TransSmart.Schemas.Shipment" RootName="carrierBooking" AssemblyQualifiedName="TM.TransSmart.Schemas.Shipment,TM.TransSmart.Schemas, Version=3.0.0.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" AlwaysTrackAllProperties="false">
           <TrackedPropertyNames />
         </Schema>
       </TrackedSchemas>
     </ModuleRef>
-    <ModuleRef Name="TM.TransSmart.Schemas" Version="1.0.0.0" Culture="neutral" PublicKeyToken="089e5464cda5fc95" FullName="TM.TransSmart.Schemas, Version=1.0.0.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95">
+    <ModuleRef Name="TM.TransSmart.Schemas" Version="3.0.0.0" Culture="neutral" PublicKeyToken="089e5464cda5fc95" FullName="TM.TransSmart.Schemas, Version=3.0.0.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95">
       <Services />
       <TrackedSchemas />
     </ModuleRef>
-    <ModuleRef Name="TM.TransSmart.Pipelines" Version="1.0.3.0" Culture="neutral" PublicKeyToken="089e5464cda5fc95" FullName="TM.TransSmart.Pipelines, Version=1.0.3.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95">
+    <ModuleRef Name="TM.TransSmart.Pipelines" Version="3.0.3.0" Culture="neutral" PublicKeyToken="089e5464cda5fc95" FullName="TM.TransSmart.Pipelines, Version=3.0.3.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95">
       <Services />
       <TrackedSchemas />
     </ModuleRef>
-    <ModuleRef Name="TM.TransSmart.Transforms" Version="1.0.21.0" Culture="neutral" PublicKeyToken="089e5464cda5fc95" FullName="TM.TransSmart.Transforms, Version=1.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95">
+    <ModuleRef Name="TM.TransSmart.Transforms" Version="3.0.21.0" Culture="neutral" PublicKeyToken="089e5464cda5fc95" FullName="TM.TransSmart.Transforms, Version=3.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95">
       <Services />
       <TrackedSchemas />
     </ModuleRef>
@@ -29,7 +29,7 @@
   <SendPortCollection>
     <SendPort Name="TM.TransSmart: TM.Shared.OrderStatus_to_TM.TransSmart.Status Send" IsStatic="true" IsTwoWay="false" BindingOption="0">
       <Description xsi:nil="true" />
-      <TransmitPipeline Name="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit" FullyQualifiedName="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit, TM.Shared.Pipelines, Version=${TM.Shared.Pipelines: Version}, Culture=neutral, PublicKeyToken=224c7e2c8b50f9df" Type="2" TrackingOption="ServiceStartEnd MessageSendReceive PipelineEvents" Description=""/>
+      <TransmitPipeline Name="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit" FullyQualifiedName="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit, TM.Shared.Pipelines, Version=${TM.Shared.Pipelines: Version2016}, Culture=neutral, PublicKeyToken=224c7e2c8b50f9df" Type="2" TrackingOption="None" Description=""/>
       <SendPipelineData>
         <Root>
           <Stages>
@@ -136,7 +136,7 @@
         </Filter>
       </Filter>
       <Transforms>
-        <Transform FullName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status" AssemblyQualifiedName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status,TM.TransSmart.Transforms, Version=1.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95"/>
+        <Transform FullName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status" AssemblyQualifiedName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status,TM.TransSmart.Transforms, Version=3.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95"/>
       </Transforms>
       <OrderedDelivery>false</OrderedDelivery>
       <Priority>5</Priority>
@@ -146,7 +146,7 @@
     </SendPort>
     <SendPort Name="TM.TransSmart: ToXMLDOC_IN" IsStatic="true" IsTwoWay="false" BindingOption="0">
       <Description xsi:nil="true"/>
-      <TransmitPipeline Name="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit" FullyQualifiedName="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit, TM.Shared.Pipelines, Version=${TM.Shared.Pipelines: Version}, Culture=neutral, PublicKeyToken=224c7e2c8b50f9df" Type="2" TrackingOption="ServiceStartEnd MessageSendReceive PipelineEvents" Description=""/>
+      <TransmitPipeline Name="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit" FullyQualifiedName="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLTransmit, TM.Shared.Pipelines, Version=${TM.Shared.Pipelines: Version2016}, Culture=neutral, PublicKeyToken=224c7e2c8b50f9df" Type="2" TrackingOption="None" Description=""/>
       <SendPipelineData>
         <Root>
           <Stages>
@@ -284,7 +284,7 @@
               <BatchSize vt="19">20</BatchSize>
             </CustomProps>
           </ReceiveLocationTransportTypeData>
-          <ReceivePipeline Name="TM.TransSmart.Pipelines.Shipments_XMLReceive" FullyQualifiedName="TM.TransSmart.Pipelines.Shipments_XMLReceive, TM.TransSmart.Pipelines, Version=1.0.3.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" Type="1" TrackingOption="None" />
+          <ReceivePipeline Name="TM.TransSmart.Pipelines.Shipments_XMLReceive" FullyQualifiedName="TM.TransSmart.Pipelines.Shipments_XMLReceive, TM.TransSmart.Pipelines, Version=3.0.3.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" Type="1" TrackingOption="None" />
           <ReceivePipelineData>
             <Root>
               <Stages>
@@ -355,7 +355,7 @@
       <Authentication>0</Authentication>
       <Tracking>0</Tracking>
       <Transforms>
-        <Transform FullName="TM.TransSmart.Transforms.TM_TransSmart_Shipment_to_TM_Shared_Order" AssemblyQualifiedName="TM.TransSmart.Transforms.TM_TransSmart_Shipment_to_TM_Shared_Order,TM.TransSmart.Transforms, Version=1.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" />
+        <Transform FullName="TM.TransSmart.Transforms.TM_TransSmart_Shipment_to_TM_Shared_Order" AssemblyQualifiedName="TM.TransSmart.Transforms.TM_TransSmart_Shipment_to_TM_Shared_Order,TM.TransSmart.Transforms, Version=3.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" />
       </Transforms>
       <RouteFailedMessage>false</RouteFailedMessage>
       <ApplicationName>TM.TransSmart</ApplicationName>
@@ -390,7 +390,7 @@
               <BatchSize vt="19">20</BatchSize>
             </CustomProps>
           </ReceiveLocationTransportTypeData>
-          <ReceivePipeline Name="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLReceive" FullyQualifiedName="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLReceive, TM.Shared.Pipelines, Version=${TM.Shared.Pipelines: Version}, Culture=neutral, PublicKeyToken=224c7e2c8b50f9df" Type="1" TrackingOption="None" Description="" />
+          <ReceivePipeline Name="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLReceive" FullyQualifiedName="TM.Shared.Pipelines.TM_Shared_Pipelines_XMLReceive, TM.Shared.Pipelines, Version=${TM.Shared.Pipelines: Version2016}, Culture=neutral, PublicKeyToken=224c7e2c8b50f9df" Type="1" TrackingOption="None" Description="" />
           <ReceivePipelineData>
             <Root>
               <Stages>
@@ -451,7 +451,7 @@
       <Authentication>0</Authentication>
       <Tracking>0</Tracking>
       <Transforms>
-        <Transform FullName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status" AssemblyQualifiedName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status,TM.TransSmart.Transforms, Version=1.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" />
+        <Transform FullName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status" AssemblyQualifiedName="TM.TransSmart.Transforms.TM_Shared_OrderStatus_to_TM_TransSmart_Status,TM.TransSmart.Transforms, Version=3.0.21.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95" />
       </Transforms>
       <RouteFailedMessage>false</RouteFailedMessage>
       <ApplicationName>TM.TransSmart</ApplicationName>
diff --git a/PipelineComponents/PipelineComponents.csproj b/PipelineComponents/PipelineComponents.csproj
index 0e6fe8c..049dd11 100644
--- a/PipelineComponents/PipelineComponents.csproj
+++ b/PipelineComponents/PipelineComponents.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TM.TransSmart.PipelineComponents</RootNamespace>
     <AssemblyName>TM.TransSmart.PipelineComponents</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/PipelineComponents/Properties/AssemblyInfo.cs b/PipelineComponents/Properties/AssemblyInfo.cs
index 22f92d5..cac8be2 100644
--- a/PipelineComponents/Properties/AssemblyInfo.cs
+++ b/PipelineComponents/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/Pipelines/Properties/AssemblyInfo.cs b/Pipelines/Properties/AssemblyInfo.cs
index 99b4cc6..2220903 100644
--- a/Pipelines/Properties/AssemblyInfo.cs
+++ b/Pipelines/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@ using Microsoft.BizTalk.XLANGs.BTXEngine;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.3.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
+[assembly: AssemblyVersion("3.0.3.0")]
+[assembly: AssemblyFileVersion("3.0.3.0")]
diff --git a/Pipelines/Shipments.XMLReceive.btp.cs b/Pipelines/Shipments.XMLReceive.btp.cs
index 052d9dc..27ab128 100644
--- a/Pipelines/Shipments.XMLReceive.btp.cs
+++ b/Pipelines/Shipments.XMLReceive.btp.cs
@@ -16,7 +16,7 @@ namespace TM.TransSmart.Pipelines
 "  <Stages>    <Stage>      <PolicyFileStage _locAttrData=\"Name\" _locID=\"1\" Name=\"Decode\" minOccurs=\""+
 "0\" maxOccurs=\"-1\" execMethod=\"All\" stageId=\"9d0e4103-4cce-4536-83fa-4a5040674ad6\" />      <Component"+
 "s>        <Component>          <Name>PipelineComponents.TrackingIdDecodingComponent,TM.Shared.Pipeli"+
-"neComponents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d</Name>          <Com"+
+"neComponents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d</Name>          <Com"+
 "ponentName>TrackingIdDecodingComponent v1.0.2</ComponentName>          <Description>Custom Pipeline "+
 "Component used retrieve Context for tracking</Description>          <Version>1.0.2</Version>        "+
 "  <Properties>            <Property Name=\"ComponentEnabled\">              <Value xsi:type=\"xsd:strin"+
@@ -26,7 +26,7 @@ namespace TM.TransSmart.Pipelines
 "            </Property>          </Properties>          <CachedDisplayName>TrackingIdDecodingCompone"+
 "nt v1.0.2</CachedDisplayName>          <CachedIsManaged>true</CachedIsManaged>        </Component>  "+
 "      <Component>          <Name>PipelineComponents.EncodingComponent,TM.Shared.PipelineComponents, "+
-"Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d</Name>          <ComponentName>Enc"+
+"Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d</Name>          <ComponentName>Enc"+
 "odingComponent v1.3</ComponentName>          <Description>Custom Pipeline Component used to change M"+
 "essage Encoding</Description>          <Version>1.3.0.0</Version>          <Properties>            <"+
 "Property Name=\"ComponentEnabled\">              <Value xsi:type=\"xsd:string\" />            </Property"+
@@ -34,7 +34,7 @@ namespace TM.TransSmart.Pipelines
 "/Property>            <Property Name=\"NewEncoding\">              <Value xsi:type=\"xsd:string\" />    "+
 "        </Property>          </Properties>          <CachedDisplayName>EncodingComponent v1.3</Cache"+
 "dDisplayName>          <CachedIsManaged>true</CachedIsManaged>        </Component>        <Component"+
-">          <Name>PipelineComponents.TrackingComponent,TM.Shared.PipelineComponents, Version=2.0.1.0,"+
+">          <Name>PipelineComponents.TrackingComponent,TM.Shared.PipelineComponents, Version=3.0.1.0,"+
 " Culture=neutral, PublicKeyToken=db1d2fbb73684f7d</Name>          <ComponentName>TrackingComponent v"+
 "2.0.2</ComponentName>          <Description>Custom Pipeline Component used to log messages instead o"+
 "f DTA Tracking</Description>          <Version>2.0.2</Version>          <Properties>            <Pro"+
@@ -54,7 +54,7 @@ namespace TM.TransSmart.Pipelines
 "y>            <Property Name=\"MessageInDatabase\">              <Value xsi:type=\"xsd:string\" />      "+
 "      </Property>          </Properties>          <CachedDisplayName>TrackingComponent v2.0.2</Cache"+
 "dDisplayName>          <CachedIsManaged>true</CachedIsManaged>        </Component>        <Component"+
-">          <Name>PipelineComponents.ReplaceComponent,TM.Shared.PipelineComponents, Version=2.0.1.0, "+
+">          <Name>PipelineComponents.ReplaceComponent,TM.Shared.PipelineComponents, Version=3.0.1.0, "+
 "Culture=neutral, PublicKeyToken=db1d2fbb73684f7d</Name>          <ComponentName>ReplaceComponent v1."+
 "3</ComponentName>          <Description>Custom Pipeline Component used to replace strings in Message"+
 " Content (delimiter: |)</Description>          <Version>1.3.0.0</Version>          <Properties>     "+
@@ -66,7 +66,7 @@ namespace TM.TransSmart.Pipelines
 "pe=\"xsd:string\" />            </Property>          </Properties>          <CachedDisplayName>Replace"+
 "Component v1.3</CachedDisplayName>          <CachedIsManaged>true</CachedIsManaged>        </Compone"+
 "nt>        <Component>          <Name>PipelineComponents.NamespaceComponent,TM.Shared.PipelineCompon"+
-"ents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d</Name>          <ComponentNa"+
+"ents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d</Name>          <ComponentNa"+
 "me>NamespaceComponent v1.3</ComponentName>          <Description>Custom Pipeline Component used to A"+
 "dd, Remove or Replace the Message Namespace</Description>          <Version>1.3.0.0</Version>       "+
 "   <Properties>            <Property Name=\"ComponentEnabled\">              <Value xsi:type=\"xsd:stri"+
@@ -75,7 +75,7 @@ namespace TM.TransSmart.Pipelines
 "e xsi:type=\"xsd:string\" />            </Property>          </Properties>          <CachedDisplayName"+
 ">NamespaceComponent v1.3</CachedDisplayName>          <CachedIsManaged>true</CachedIsManaged>       "+
 " </Component>        <Component>          <Name>PipelineComponents.TrackingComponent,TM.Shared.Pipel"+
-"ineComponents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d</Name>          <Co"+
+"ineComponents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d</Name>          <Co"+
 "mponentName>TrackingComponent v2.0.2</ComponentName>          <Description>Custom Pipeline Component"+
 " used to log messages instead of DTA Tracking</Description>          <Version>2.0.2</Version>       "+
 "   <Properties>            <Property Name=\"ComponentEnabled\">              <Value xsi:type=\"xsd:stri"+
@@ -97,7 +97,7 @@ namespace TM.TransSmart.Pipelines
 " </Component>      </Components>    </Stage>    <Stage>      <PolicyFileStage _locAttrData=\"Name\" _l"+
 "ocID=\"2\" Name=\"Disassemble\" minOccurs=\"0\" maxOccurs=\"-1\" execMethod=\"FirstMatch\" stageId=\"9d0e4105-4"+
 "cce-4536-83fa-4a5040674ad6\" />      <Components>        <Component>          <Name>TM.TransSmart.Pip"+
-"elineComponents.CPL_Debatch,TM.TransSmart.PipelineComponents, Version=1.0.1.0, Culture=neutral, Publ"+
+"elineComponents.CPL_Debatch,TM.TransSmart.PipelineComponents, Version=3.0.1.0, Culture=neutral, Publ"+
 "icKeyToken=089e5464cda5fc95</Name>          <ComponentName>TransSmart Debatch Disassembler</Componen"+
 "tName>          <Description>Streaming TransSmart Debatch Disassembler Component</Description>      "+
 "    <Version>1.0</Version>          <Properties />          <CachedDisplayName>TransSmart Debatch Di"+
@@ -105,7 +105,7 @@ namespace TM.TransSmart.Pipelines
 "     </Components>    </Stage>    <Stage>      <PolicyFileStage _locAttrData=\"Name\" _locID=\"3\" Name="+
 "\"Validate\" minOccurs=\"0\" maxOccurs=\"-1\" execMethod=\"All\" stageId=\"9d0e410d-4cce-4536-83fa-4a5040674a"+
 "d6\" />      <Components>        <Component>          <Name>PipelineComponents.TrackingComponent,TM.S"+
-"hared.PipelineComponents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d</Name>  "+
+"hared.PipelineComponents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d</Name>  "+
 "        <ComponentName>TrackingComponent v2.0.2</ComponentName>          <Description>Custom Pipelin"+
 "e Component used to log messages instead of DTA Tracking</Description>          <Version>2.0.2</Vers"+
 "ion>          <Properties>            <Property Name=\"ComponentEnabled\">              <Value xsi:typ"+
@@ -128,12 +128,12 @@ namespace TM.TransSmart.Pipelines
 "a=\"Name\" _locID=\"4\" Name=\"ResolveParty\" minOccurs=\"0\" maxOccurs=\"-1\" execMethod=\"All\" stageId=\"9d0e4"+
 "10e-4cce-4536-83fa-4a5040674ad6\" />      <Components />    </Stage>  </Stages></Document>";
         
-        private const string _versionDependentGuid = "9b458fb3-27e2-4cab-b008-813be116621f";
+        private const string _versionDependentGuid = "2b7dae02-82a7-4519-bea7-1d3ccbc4d9d9";
         
         public Shipments_XMLReceive()
         {
             Microsoft.BizTalk.PipelineOM.Stage stage = this.AddStage(new System.Guid("9d0e4103-4cce-4536-83fa-4a5040674ad6"), Microsoft.BizTalk.PipelineOM.ExecutionMode.all);
-            IBaseComponent comp0 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.TrackingIdDecodingComponent,TM.Shared.PipelineComponents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");;
+            IBaseComponent comp0 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.TrackingIdDecodingComponent,TM.Shared.PipelineComponents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");;
             if (comp0 is IPersistPropertyBag)
             {
                 string comp0XmlProperties = "<?xml version=\"1.0\" encoding=\"utf-16\"?><PropertyBag xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-inst"+
@@ -146,7 +146,7 @@ namespace TM.TransSmart.Pipelines
                 ((IPersistPropertyBag)(comp0)).Load(pb, 0);
             }
             this.AddComponent(stage, comp0);
-            IBaseComponent comp1 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.EncodingComponent,TM.Shared.PipelineComponents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");;
+            IBaseComponent comp1 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.EncodingComponent,TM.Shared.PipelineComponents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");;
             if (comp1 is IPersistPropertyBag)
             {
                 string comp1XmlProperties = "<?xml version=\"1.0\" encoding=\"utf-16\"?><PropertyBag xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-inst"+
@@ -158,7 +158,7 @@ namespace TM.TransSmart.Pipelines
                 ((IPersistPropertyBag)(comp1)).Load(pb, 0);
             }
             this.AddComponent(stage, comp1);
-            IBaseComponent comp2 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.TrackingComponent,TM.Shared.PipelineComponents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");;
+            IBaseComponent comp2 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.TrackingComponent,TM.Shared.PipelineComponents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");;
             if (comp2 is IPersistPropertyBag)
             {
                 string comp2XmlProperties = "<?xml version=\"1.0\" encoding=\"utf-16\"?><PropertyBag xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-inst"+
@@ -179,7 +179,7 @@ namespace TM.TransSmart.Pipelines
                 ((IPersistPropertyBag)(comp2)).Load(pb, 0);
             }
             this.AddComponent(stage, comp2);
-            IBaseComponent comp3 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.ReplaceComponent,TM.Shared.PipelineComponents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");;
+            IBaseComponent comp3 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.ReplaceComponent,TM.Shared.PipelineComponents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");;
             if (comp3 is IPersistPropertyBag)
             {
                 string comp3XmlProperties = "<?xml version=\"1.0\" encoding=\"utf-16\"?><PropertyBag xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-inst"+
@@ -193,7 +193,7 @@ namespace TM.TransSmart.Pipelines
                 ((IPersistPropertyBag)(comp3)).Load(pb, 0);
             }
             this.AddComponent(stage, comp3);
-            IBaseComponent comp4 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.NamespaceComponent,TM.Shared.PipelineComponents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");;
+            IBaseComponent comp4 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.NamespaceComponent,TM.Shared.PipelineComponents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");;
             if (comp4 is IPersistPropertyBag)
             {
                 string comp4XmlProperties = "<?xml version=\"1.0\" encoding=\"utf-16\"?><PropertyBag xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-inst"+
@@ -205,7 +205,7 @@ namespace TM.TransSmart.Pipelines
                 ((IPersistPropertyBag)(comp4)).Load(pb, 0);
             }
             this.AddComponent(stage, comp4);
-            IBaseComponent comp5 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.TrackingComponent,TM.Shared.PipelineComponents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");;
+            IBaseComponent comp5 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.TrackingComponent,TM.Shared.PipelineComponents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");;
             if (comp5 is IPersistPropertyBag)
             {
                 string comp5XmlProperties = "<?xml version=\"1.0\" encoding=\"utf-16\"?><PropertyBag xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-inst"+
@@ -227,7 +227,7 @@ namespace TM.TransSmart.Pipelines
             }
             this.AddComponent(stage, comp5);
             stage = this.AddStage(new System.Guid("9d0e4105-4cce-4536-83fa-4a5040674ad6"), Microsoft.BizTalk.PipelineOM.ExecutionMode.firstRecognized);
-            IBaseComponent comp6 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("TM.TransSmart.PipelineComponents.CPL_Debatch,TM.TransSmart.PipelineComponents, Version=1.0.1.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95");;
+            IBaseComponent comp6 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("TM.TransSmart.PipelineComponents.CPL_Debatch,TM.TransSmart.PipelineComponents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95");;
             if (comp6 is IPersistPropertyBag)
             {
                 string comp6XmlProperties = "<?xml version=\"1.0\" encoding=\"utf-16\"?><PropertyBag xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-inst"+
@@ -237,7 +237,7 @@ namespace TM.TransSmart.Pipelines
             }
             this.AddComponent(stage, comp6);
             stage = this.AddStage(new System.Guid("9d0e410d-4cce-4536-83fa-4a5040674ad6"), Microsoft.BizTalk.PipelineOM.ExecutionMode.all);
-            IBaseComponent comp7 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.TrackingComponent,TM.Shared.PipelineComponents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");;
+            IBaseComponent comp7 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.TrackingComponent,TM.Shared.PipelineComponents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");;
             if (comp7 is IPersistPropertyBag)
             {
                 string comp7XmlProperties = "<?xml version=\"1.0\" encoding=\"utf-16\"?><PropertyBag xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-inst"+
diff --git a/Schemas/Properties/AssemblyInfo.cs b/Schemas/Properties/AssemblyInfo.cs
index 905cb10..724821a 100644
--- a/Schemas/Properties/AssemblyInfo.cs
+++ b/Schemas/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@ using Microsoft.BizTalk.XLANGs.BTXEngine;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.0.0")]
diff --git a/TransSmart.sln b/TransSmart.sln
index 834c34f..bfe9a38 100644
--- a/TransSmart.sln
+++ b/TransSmart.sln
@@ -6,11 +6,11 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deployment", "Deployment", "{22F4DF7A-33C9-430D-AAF1-616EC2F7C5AC}"
 	ProjectSection(SolutionItems) = preProject
 		Deployment\Deployment.btdfproj = Deployment\Deployment.btdfproj
-		Deployment\InstallWizard.xml = Deployment\InstallWizard.xml
+		..\HelloBizTalk2013World_converted\Deployment\InstallWizard.xml = ..\HelloBizTalk2013World_converted\Deployment\InstallWizard.xml
 		Deployment\License.rtf = Deployment\License.rtf
 		Deployment\PortBindingsMaster.xml = Deployment\PortBindingsMaster.xml
 		Deployment\SettingsFileGenerator.xml = Deployment\SettingsFileGenerator.xml
-		Deployment\UnInstallWizard.xml = Deployment\UnInstallWizard.xml
+		..\HelloBizTalk2013World_converted\Deployment\UnInstallWizard.xml = ..\HelloBizTalk2013World_converted\Deployment\UnInstallWizard.xml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{2581E85C-A9E6-4AB9-B2B3-0B33BBD2E172}"
diff --git a/Transforms/CustomExtensions.xml b/Transforms/CustomExtensions.xml
index 059e6ed..ae5df63 100644
Binary files a/Transforms/CustomExtensions.xml and b/Transforms/CustomExtensions.xml differ
diff --git a/Transforms/Properties/AssemblyInfo.cs b/Transforms/Properties/AssemblyInfo.cs
index 3c9fa0f..e61dff0 100644
--- a/Transforms/Properties/AssemblyInfo.cs
+++ b/Transforms/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@ using Microsoft.BizTalk.XLANGs.BTXEngine;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.21.0")]
-[assembly: AssemblyFileVersion("1.0.21.0")]
+[assembly: AssemblyVersion("3.0.21.0")]
+[assembly: AssemblyFileVersion("3.0.21.0")]
diff --git a/Transforms/TM.Shared.OrderStatus_to_TM.TransSmart.Status.btm b/Transforms/TM.Shared.OrderStatus_to_TM.TransSmart.Status.btm
index e7db062..b7b0e68 100644
Binary files a/Transforms/TM.Shared.OrderStatus_to_TM.TransSmart.Status.btm and b/Transforms/TM.Shared.OrderStatus_to_TM.TransSmart.Status.btm differ
diff --git a/Transforms/TM.Shared.OrderStatus_to_TM.TransSmart.Status.btm.cs b/Transforms/TM.Shared.OrderStatus_to_TM.TransSmart.Status.btm.cs
index 8fdef27..315408c 100644
--- a/Transforms/TM.Shared.OrderStatus_to_TM.TransSmart.Status.btm.cs
+++ b/Transforms/TM.Shared.OrderStatus_to_TM.TransSmart.Status.btm.cs
@@ -105,19 +105,19 @@ namespace TM.TransSmart.Transforms {
                    AssemblyName=""Microsoft.BizTalk.CrossReferencing, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"" 
                    ClassName=""Microsoft.BizTalk.CrossReferencing.CrossReferencing"" />
   <ExtensionObject Namespace=""TM.Shared.Components.DateTime""
-                   AssemblyName=""TM.Shared.Components, Version=1.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
+                   AssemblyName=""TM.Shared.Components, Version=3.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
                    ClassName=""TM.Shared.Components.DateTimeFunctions"" />
   <ExtensionObject Namespace=""TM.Shared.Components.KeyList""
-                   AssemblyName=""TM.Shared.Components, Version=1.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
+                   AssemblyName=""TM.Shared.Components, Version=3.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
                    ClassName=""TM.Shared.Components.KeyListFunctions"" />
   <ExtensionObject Namespace=""TM.Shared.Components.SSO""
-                   AssemblyName=""TM.Shared.Components, Version=1.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
+                   AssemblyName=""TM.Shared.Components, Version=3.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
                    ClassName=""TM.Shared.Components.SSOFunctions"" />
   <ExtensionObject Namespace=""TM.Shared.Components.String""
-                   AssemblyName=""TM.Shared.Components, Version=1.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
+                   AssemblyName=""TM.Shared.Components, Version=3.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
                    ClassName=""TM.Shared.Components.StringFunctions"" />
   <ExtensionObject Namespace=""TM.TransSmart.Components""
-                 AssemblyName=""TM.TransSmart.Components, Version=1.0.1.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95""
+                 AssemblyName=""TM.TransSmart.Components, Version=3.0.1.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95""
                  ClassName=""TM.TransSmart.Components.Helper"" />
 </ExtensionObjects>";
         
diff --git a/Transforms/TM.TransSmart.Shipment_to_TM.Shared.Order.btm b/Transforms/TM.TransSmart.Shipment_to_TM.Shared.Order.btm
index 935b891..60d4c30 100644
Binary files a/Transforms/TM.TransSmart.Shipment_to_TM.Shared.Order.btm and b/Transforms/TM.TransSmart.Shipment_to_TM.Shared.Order.btm differ
diff --git a/Transforms/TM.TransSmart.Shipment_to_TM.Shared.Order.btm.cs b/Transforms/TM.TransSmart.Shipment_to_TM.Shared.Order.btm.cs
index a254f69..80d2433 100644
--- a/Transforms/TM.TransSmart.Shipment_to_TM.Shared.Order.btm.cs
+++ b/Transforms/TM.TransSmart.Shipment_to_TM.Shared.Order.btm.cs
@@ -809,19 +809,19 @@ namespace TM.TransSmart.Transforms {
                    AssemblyName=""Microsoft.BizTalk.CrossReferencing, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"" 
                    ClassName=""Microsoft.BizTalk.CrossReferencing.CrossReferencing"" />
   <ExtensionObject Namespace=""TM.Shared.Components.DateTime""
-                   AssemblyName=""TM.Shared.Components, Version=1.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
+                   AssemblyName=""TM.Shared.Components, Version=3.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
                    ClassName=""TM.Shared.Components.DateTimeFunctions"" />
   <ExtensionObject Namespace=""TM.Shared.Components.KeyList""
-                   AssemblyName=""TM.Shared.Components, Version=1.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
+                   AssemblyName=""TM.Shared.Components, Version=3.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
                    ClassName=""TM.Shared.Components.KeyListFunctions"" />
   <ExtensionObject Namespace=""TM.Shared.Components.SSO""
-                   AssemblyName=""TM.Shared.Components, Version=1.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
+                   AssemblyName=""TM.Shared.Components, Version=3.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
                    ClassName=""TM.Shared.Components.SSOFunctions"" />
   <ExtensionObject Namespace=""TM.Shared.Components.String""
-                   AssemblyName=""TM.Shared.Components, Version=1.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
+                   AssemblyName=""TM.Shared.Components, Version=3.0.7.0, Culture=neutral, PublicKeyToken=9cbf569b151cb1d4""
                    ClassName=""TM.Shared.Components.StringFunctions"" />
   <ExtensionObject Namespace=""TM.TransSmart.Components""
-                 AssemblyName=""TM.TransSmart.Components, Version=1.0.1.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95""
+                 AssemblyName=""TM.TransSmart.Components, Version=3.0.1.0, Culture=neutral, PublicKeyToken=089e5464cda5fc95""
                  ClassName=""TM.TransSmart.Components.Helper"" />
 </ExtensionObjects>";