From b8406a7f7135244e77f095c86d7979c000edbdd0 Mon Sep 17 00:00:00 2001
From: Tom Raterman <tom@tomraterman.com>
Date: Tue, 14 Nov 2023 11:58:54 -0500
Subject: [PATCH] WIP

---
 PartSource.Api/PartSource.Api.csproj          |  1 +
 .../Jobs/ExecuteSsisPackages.cs               |  2 +-
 PartSource.Automation/Program.cs              |  2 +-
 PartSource.Automation/Services/SsisService.cs |  2 +-
 PartSource.Data/Nexpart/AddImg.cs             |  2 +-
 PartSource.Data/Nexpart/AddImgs.cs            |  2 +-
 PartSource.Data/Nexpart/App.cs                |  2 +-
 PartSource.Data/Nexpart/ApplicationSearch.cs  |  2 +-
 .../Nexpart/ApplicationSearchResponse.cs      |  2 +-
 PartSource.Data/Nexpart/Apps.cs               |  4 +-
 PartSource.Data/Nexpart/BaseVehicle.cs        |  2 +-
 PartSource.Data/Nexpart/BaseVehicleDetail.cs  | 10 ++--
 .../Nexpart/BaseVehicleDetailLookup.cs        |  2 +-
 .../BaseVehicleDetailLookupResponse.cs        |  2 +-
 PartSource.Data/Nexpart/BaseVehicleSearch.cs  |  2 +-
 .../Nexpart/BaseVehicleSearchResponse.cs      |  2 +-
 PartSource.Data/Nexpart/BaseVehicles.cs       |  4 +-
 PartSource.Data/Nexpart/Body.cs               | 58 +++++++++----------
 PartSource.Data/Nexpart/Criterion.cs          |  2 +-
 PartSource.Data/Nexpart/Engine.cs             |  2 +-
 PartSource.Data/Nexpart/EngineSearch.cs       |  2 +-
 .../Nexpart/EngineSearchResponse.cs           |  2 +-
 PartSource.Data/Nexpart/Engines.cs            |  4 +-
 PartSource.Data/Nexpart/Exceptions.cs         |  2 +-
 PartSource.Data/Nexpart/Item.cs               |  2 +-
 PartSource.Data/Nexpart/Items.cs              |  4 +-
 PartSource.Data/Nexpart/Make.cs               |  2 +-
 PartSource.Data/Nexpart/MakeSearch.cs         | 10 ++--
 PartSource.Data/Nexpart/MakeSearchResponse.cs |  2 +-
 PartSource.Data/Nexpart/Makes.cs              |  4 +-
 PartSource.Data/Nexpart/MenuNode.cs           |  2 +-
 PartSource.Data/Nexpart/MenuNodes.cs          |  4 +-
 PartSource.Data/Nexpart/MenuNodesLookup.cs    |  2 +-
 .../Nexpart/MenuNodesLookupResponse.cs        |  2 +-
 PartSource.Data/Nexpart/Model.cs              |  2 +-
 PartSource.Data/Nexpart/ModelSearch.cs        | 12 ++--
 .../Nexpart/ModelSearchResponse.cs            |  4 +-
 PartSource.Data/Nexpart/Models.cs             |  4 +-
 PartSource.Data/Nexpart/PSRequestHeader.cs    |  8 +--
 PartSource.Data/Nexpart/PSResponseHeader.cs   | 14 ++---
 PartSource.Data/Nexpart/Part.cs               |  4 +-
 PartSource.Data/Nexpart/PartNumber.cs         |  2 +-
 PartSource.Data/Nexpart/PartType.cs           |  2 +-
 PartSource.Data/Nexpart/PartTypeSearch.cs     |  2 +-
 .../Nexpart/PartTypeSearchResponse.cs         |  2 +-
 PartSource.Data/Nexpart/PartTypes.cs          |  4 +-
 .../Nexpart/PartTypesValidateLookup.cs        |  2 +-
 .../PartTypesValidateLookupResponse.cs        |  2 +-
 PartSource.Data/Nexpart/PrimaryImg.cs         |  2 +-
 PartSource.Data/Nexpart/Region.cs             |  2 +-
 PartSource.Data/Nexpart/RegionId.cs           |  2 +-
 PartSource.Data/Nexpart/ResultOption.cs       |  2 +-
 .../Nexpart/SmartPageDataSearch.cs            |  8 +--
 .../Nexpart/SmartPageDataSearchResponse.cs    |  2 +-
 PartSource.Data/Nexpart/SubModel.cs           |  2 +-
 .../Nexpart/SubModelSearchResponse.cs         |  2 +-
 PartSource.Data/Nexpart/SubModels.cs          |  4 +-
 PartSource.Data/Nexpart/SubModelsSearch.cs    |  2 +-
 PartSource.Data/Nexpart/VehicleDetail.cs      |  4 +-
 PartSource.Data/Nexpart/VehicleIdSearch.cs    |  2 +-
 .../Nexpart/VehicleIdSearchResponse.cs        |  2 +-
 PartSource.Data/Nexpart/VehicleIdentifier.cs  |  6 +-
 PartSource.Data/Nexpart/VehicleType.cs        |  2 +-
 PartSource.Data/Nexpart/VehicleTypes.cs       |  4 +-
 PartSource.Data/Nexpart/VehicleTypesGet.cs    |  4 +-
 .../Nexpart/VehicleTypesGetResponse.cs        |  2 +-
 PartSource.Data/Nexpart/WHIEngine.cs          |  2 +-
 PartSource.Data/Nexpart/WHIEngineSearch.cs    |  2 +-
 .../Nexpart/WHIEngineSearchResponse.cs        |  2 +-
 PartSource.Data/Nexpart/WHIEngines.cs         |  4 +-
 PartSource.Data/Nexpart/Years.cs              |  2 +-
 PartSource.Services/NexpartService.cs         |  2 +-
 72 files changed, 142 insertions(+), 141 deletions(-)

diff --git a/PartSource.Api/PartSource.Api.csproj b/PartSource.Api/PartSource.Api.csproj
index 55bc2ca..09e7782 100644
--- a/PartSource.Api/PartSource.Api.csproj
+++ b/PartSource.Api/PartSource.Api.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <UserSecretsId>f9e2fd37-0f2d-4e3a-955a-8e49a16fce1c</UserSecretsId>
     <Configurations>Debug;Release;Also Debug</Configurations>
+      <SatelliteResourceLanguages>en-us;en</SatelliteResourceLanguages>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/PartSource.Automation/Jobs/ExecuteSsisPackages.cs b/PartSource.Automation/Jobs/ExecuteSsisPackages.cs
index b078563..c287910 100644
--- a/PartSource.Automation/Jobs/ExecuteSsisPackages.cs
+++ b/PartSource.Automation/Jobs/ExecuteSsisPackages.cs
@@ -17,7 +17,7 @@ namespace PartSource.Automation.Jobs
 		private readonly ILogger<ExecuteSsisPackages> _logger;
 
 		// TODO: set from config
-		private readonly string[] _ssisPackages = {"Parts Price", "Parts Availability" };
+		private readonly string[] _ssisPackages = {"Parts Price" };
 
 		public ExecuteSsisPackages(EmailService emailService, IConfiguration configuration, SsisService ssisService, ILogger<ExecuteSsisPackages> logger)
 		{
diff --git a/PartSource.Automation/Program.cs b/PartSource.Automation/Program.cs
index 90a8d1d..4ef6835 100644
--- a/PartSource.Automation/Program.cs
+++ b/PartSource.Automation/Program.cs
@@ -100,7 +100,7 @@ namespace PartSource.Automation
                                 //    //.StartsAt(DateTime.Today.AddHours(25))
                                 //    )
 
-                            .HasJob<UpdateFitment>(options => options.HasInterval(new TimeSpan(24, 0, 0))
+                            .HasJob<UpdatePricing>(options => options.HasInterval(new TimeSpan(24, 0, 0))
                                 //.HasDependency<ExecuteSsisPackages>()
                          //       .StartsAt(DateTime.Today.AddHours(28))
                             );
diff --git a/PartSource.Automation/Services/SsisService.cs b/PartSource.Automation/Services/SsisService.cs
index 6fccf2a..246227b 100644
--- a/PartSource.Automation/Services/SsisService.cs
+++ b/PartSource.Automation/Services/SsisService.cs
@@ -28,7 +28,7 @@ namespace PartSource.Automation.Services
                 {
                     StartInfo = new ProcessStartInfo
                     {
-                        FileName = "dtexec",
+                        FileName = "C:\\Program Files (x86)\\Microsoft SQL Server\\130\\DTS\\Binn\\dtexec",
                         Arguments = $"/file \"{_ssisConfiguration.Directory}\\{packageName}\"",
                         UseShellExecute = false,
                         CreateNoWindow = false,
diff --git a/PartSource.Data/Nexpart/AddImg.cs b/PartSource.Data/Nexpart/AddImg.cs
index d653707..2f140e6 100644
--- a/PartSource.Data/Nexpart/AddImg.cs
+++ b/PartSource.Data/Nexpart/AddImg.cs
@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class AddImg
     {
         [XmlAttribute]
diff --git a/PartSource.Data/Nexpart/AddImgs.cs b/PartSource.Data/Nexpart/AddImgs.cs
index 245b816..bd62473 100644
--- a/PartSource.Data/Nexpart/AddImgs.cs
+++ b/PartSource.Data/Nexpart/AddImgs.cs
@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class AddImgs
     {
         [XmlElement]
diff --git a/PartSource.Data/Nexpart/App.cs b/PartSource.Data/Nexpart/App.cs
index 81308cf..9e429f8 100644
--- a/PartSource.Data/Nexpart/App.cs
+++ b/PartSource.Data/Nexpart/App.cs
@@ -8,7 +8,7 @@ using Newtonsoft.Json;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class App
     {
         [XmlElement]
diff --git a/PartSource.Data/Nexpart/ApplicationSearch.cs b/PartSource.Data/Nexpart/ApplicationSearch.cs
index d343f32..b4a3a29 100644
--- a/PartSource.Data/Nexpart/ApplicationSearch.cs
+++ b/PartSource.Data/Nexpart/ApplicationSearch.cs
@@ -7,7 +7,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class ApplicationSearch
     {
         public ApplicationSearch()
diff --git a/PartSource.Data/Nexpart/ApplicationSearchResponse.cs b/PartSource.Data/Nexpart/ApplicationSearchResponse.cs
index b9b4bbf..1b20c86 100644
--- a/PartSource.Data/Nexpart/ApplicationSearchResponse.cs
+++ b/PartSource.Data/Nexpart/ApplicationSearchResponse.cs
@@ -8,7 +8,7 @@ using PartSource.Data.Nexpart.Interfaces;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class ApplicationSearchResponse : IResponseElement<Apps>
     {
 
diff --git a/PartSource.Data/Nexpart/Apps.cs b/PartSource.Data/Nexpart/Apps.cs
index c10214d..de49601 100644
--- a/PartSource.Data/Nexpart/Apps.cs
+++ b/PartSource.Data/Nexpart/Apps.cs
@@ -3,10 +3,10 @@ using Newtonsoft.Json;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class Apps
     {
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         [JsonProperty("wipers")]
         public App[] App { get; set; }
     }
diff --git a/PartSource.Data/Nexpart/BaseVehicle.cs b/PartSource.Data/Nexpart/BaseVehicle.cs
index 6f10dd4..632ef67 100644
--- a/PartSource.Data/Nexpart/BaseVehicle.cs
+++ b/PartSource.Data/Nexpart/BaseVehicle.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class BaseVehicle
     {
         [XmlAttribute]
diff --git a/PartSource.Data/Nexpart/BaseVehicleDetail.cs b/PartSource.Data/Nexpart/BaseVehicleDetail.cs
index 667ef30..b819b19 100644
--- a/PartSource.Data/Nexpart/BaseVehicleDetail.cs
+++ b/PartSource.Data/Nexpart/BaseVehicleDetail.cs
@@ -8,22 +8,22 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class BaseVehicleDetail
   {
     [XmlAttribute]
     public int WHIMakeId { get; set; }
 
-    [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public int BaseVehicleId { get; set; }
 
-    [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public string MakeName { get; set; }
 
-    [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public string ModelName { get; set; }
 
-    [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public int Year { get; set; }
   }
 }
diff --git a/PartSource.Data/Nexpart/BaseVehicleDetailLookup.cs b/PartSource.Data/Nexpart/BaseVehicleDetailLookup.cs
index b7e90f3..e5534d8 100644
--- a/PartSource.Data/Nexpart/BaseVehicleDetailLookup.cs
+++ b/PartSource.Data/Nexpart/BaseVehicleDetailLookup.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class BaseVehicleDetailLookup
   {
     public BaseVehicleDetailLookup()
diff --git a/PartSource.Data/Nexpart/BaseVehicleDetailLookupResponse.cs b/PartSource.Data/Nexpart/BaseVehicleDetailLookupResponse.cs
index b4d8b28..2514726 100644
--- a/PartSource.Data/Nexpart/BaseVehicleDetailLookupResponse.cs
+++ b/PartSource.Data/Nexpart/BaseVehicleDetailLookupResponse.cs
@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class BaseVehicleDetailLookupResponse : IResponseElement<BaseVehicleDetail>
   {
     [XmlElement]
diff --git a/PartSource.Data/Nexpart/BaseVehicleSearch.cs b/PartSource.Data/Nexpart/BaseVehicleSearch.cs
index fda2c9e..fb7b6cf 100644
--- a/PartSource.Data/Nexpart/BaseVehicleSearch.cs
+++ b/PartSource.Data/Nexpart/BaseVehicleSearch.cs
@@ -2,7 +2,7 @@
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class BaseVehicleSearch
     {
         public BaseVehicleSearch()
diff --git a/PartSource.Data/Nexpart/BaseVehicleSearchResponse.cs b/PartSource.Data/Nexpart/BaseVehicleSearchResponse.cs
index 1dcd8b2..f9bc7e6 100644
--- a/PartSource.Data/Nexpart/BaseVehicleSearchResponse.cs
+++ b/PartSource.Data/Nexpart/BaseVehicleSearchResponse.cs
@@ -3,7 +3,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class BaseVehicleSearchResponse : IResponseElement<BaseVehicles>
     {
         [XmlElement]
diff --git a/PartSource.Data/Nexpart/BaseVehicles.cs b/PartSource.Data/Nexpart/BaseVehicles.cs
index 3367fd3..52343ae 100644
--- a/PartSource.Data/Nexpart/BaseVehicles.cs
+++ b/PartSource.Data/Nexpart/BaseVehicles.cs
@@ -5,10 +5,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class BaseVehicles
     {
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public BaseVehicle[] BaseVehicle { get; set; }
 
 
diff --git a/PartSource.Data/Nexpart/Body.cs b/PartSource.Data/Nexpart/Body.cs
index c38881f..0780391 100644
--- a/PartSource.Data/Nexpart/Body.cs
+++ b/PartSource.Data/Nexpart/Body.cs
@@ -8,37 +8,37 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class Body
     {
-        [XmlElement(ElementName = "ApplicationSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(ApplicationSearch))]
-        [XmlElement(ElementName = "ApplicationSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(ApplicationSearchResponse))]
-        [XmlElement(ElementName = "BaseVehicleDetailLookup", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(BaseVehicleDetailLookup))]
-        [XmlElement(ElementName = "BaseVehicleDetailLookupResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(BaseVehicleDetailLookupResponse))]
-        [XmlElement(ElementName = "BaseVehicleSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(BaseVehicleSearch))]
-        [XmlElement(ElementName = "BaseVehicleSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(BaseVehicleSearchResponse))]
-        [XmlElement(ElementName = "EngineSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(EngineSearch))]
-        [XmlElement(ElementName = "EngineSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(EngineSearchResponse))]
-        [XmlElement(ElementName = "MakeSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(MakeSearch))]
-        [XmlElement(ElementName = "MakeSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(MakeSearchResponse))]
-        [XmlElement(ElementName = "ModelSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(ModelSearch))]
-        [XmlElement(ElementName = "ModelSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(ModelSearchResponse))]
-        [XmlElement(ElementName = "MenuNodesLookup", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(MenuNodesLookup))]
-        [XmlElement(ElementName = "MenuNodesLookupResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(MenuNodesLookupResponse))]
-        [XmlElement(ElementName = "PartTypeSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(PartTypeSearch))]
-        [XmlElement(ElementName = "PartTypeSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(PartTypeSearchResponse))]
-        [XmlElement(ElementName = "PartTypesValidateLookup", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(PartTypesValidateLookup))]
-        [XmlElement(ElementName = "PartTypesValidateLookupResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(PartTypesValidateLookupResponse))]
-        [XmlElement(ElementName = "SmartPageDataSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(SmartPageDataSearch))]
-        [XmlElement(ElementName = "SmartPageDataSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(SmartPageDataSearchResponse))]
-        [XmlElement(ElementName = "SubModelSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(SubModelSearch))]
-        [XmlElement(ElementName = "SubModelSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(SubModelSearchResponse))]
-        [XmlElement(ElementName = "VehicleIdSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(VehicleIdSearch))]
-        [XmlElement(ElementName = "VehicleIdSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(VehicleIdSearchResponse))]
-        [XmlElement(ElementName = "VehicleTypesGet", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(VehicleTypesGet))]
-        [XmlElement(ElementName = "VehicleTypesGetResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(VehicleTypesGetResponse))]
-        [XmlElement(ElementName = "WHIEngineSearch", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(WHIEngineSearch))]
-        [XmlElement(ElementName = "WHIEngineSearchResponse", Namespace = "http://whisolutions.com/PartSelectService-v1", Type = typeof(WHIEngineSearchResponse))]
+        [XmlElement(ElementName = "ApplicationSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(ApplicationSearch))]
+        [XmlElement(ElementName = "ApplicationSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(ApplicationSearchResponse))]
+        [XmlElement(ElementName = "BaseVehicleDetailLookup", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(BaseVehicleDetailLookup))]
+        [XmlElement(ElementName = "BaseVehicleDetailLookupResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(BaseVehicleDetailLookupResponse))]
+        [XmlElement(ElementName = "BaseVehicleSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(BaseVehicleSearch))]
+        [XmlElement(ElementName = "BaseVehicleSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(BaseVehicleSearchResponse))]
+        [XmlElement(ElementName = "EngineSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(EngineSearch))]
+        [XmlElement(ElementName = "EngineSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(EngineSearchResponse))]
+        [XmlElement(ElementName = "MakeSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(MakeSearch))]
+        [XmlElement(ElementName = "MakeSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(MakeSearchResponse))]
+        [XmlElement(ElementName = "ModelSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(ModelSearch))]
+        [XmlElement(ElementName = "ModelSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(ModelSearchResponse))]
+        [XmlElement(ElementName = "MenuNodesLookup", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(MenuNodesLookup))]
+        [XmlElement(ElementName = "MenuNodesLookupResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(MenuNodesLookupResponse))]
+        [XmlElement(ElementName = "PartTypeSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(PartTypeSearch))]
+        [XmlElement(ElementName = "PartTypeSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(PartTypeSearchResponse))]
+        [XmlElement(ElementName = "PartTypesValidateLookup", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(PartTypesValidateLookup))]
+        [XmlElement(ElementName = "PartTypesValidateLookupResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(PartTypesValidateLookupResponse))]
+        [XmlElement(ElementName = "SmartPageDataSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(SmartPageDataSearch))]
+        [XmlElement(ElementName = "SmartPageDataSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(SmartPageDataSearchResponse))]
+        [XmlElement(ElementName = "SubModelSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(SubModelSearch))]
+        [XmlElement(ElementName = "SubModelSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(SubModelSearchResponse))]
+        [XmlElement(ElementName = "VehicleIdSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(VehicleIdSearch))]
+        [XmlElement(ElementName = "VehicleIdSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(VehicleIdSearchResponse))]
+        [XmlElement(ElementName = "VehicleTypesGet", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(VehicleTypesGet))]
+        [XmlElement(ElementName = "VehicleTypesGetResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(VehicleTypesGetResponse))]
+        [XmlElement(ElementName = "WHIEngineSearch", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(WHIEngineSearch))]
+        [XmlElement(ElementName = "WHIEngineSearchResponse", Namespace = "http://whisolutions.com/pss/common/model/parts", Type = typeof(WHIEngineSearchResponse))]
         public object Content { get; set; }
     }
 }
diff --git a/PartSource.Data/Nexpart/Criterion.cs b/PartSource.Data/Nexpart/Criterion.cs
index 73ae819..15386cf 100644
--- a/PartSource.Data/Nexpart/Criterion.cs
+++ b/PartSource.Data/Nexpart/Criterion.cs
@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
 	public class Criterion
 	{
 		[XmlAttribute]
diff --git a/PartSource.Data/Nexpart/Engine.cs b/PartSource.Data/Nexpart/Engine.cs
index 1ccffc9..395260a 100644
--- a/PartSource.Data/Nexpart/Engine.cs
+++ b/PartSource.Data/Nexpart/Engine.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class Engine
     {
         [XmlAttribute]
diff --git a/PartSource.Data/Nexpart/EngineSearch.cs b/PartSource.Data/Nexpart/EngineSearch.cs
index 587b0e5..c9e7812 100644
--- a/PartSource.Data/Nexpart/EngineSearch.cs
+++ b/PartSource.Data/Nexpart/EngineSearch.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
 	public class EngineSearch
 	{
 		public EngineSearch()
diff --git a/PartSource.Data/Nexpart/EngineSearchResponse.cs b/PartSource.Data/Nexpart/EngineSearchResponse.cs
index 9be5b2f..d0d5ee1 100644
--- a/PartSource.Data/Nexpart/EngineSearchResponse.cs
+++ b/PartSource.Data/Nexpart/EngineSearchResponse.cs
@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class EngineSearchResponse : IResponseElement<Engines>
   {
     [XmlElement]
diff --git a/PartSource.Data/Nexpart/Engines.cs b/PartSource.Data/Nexpart/Engines.cs
index 63674cd..0049192 100644
--- a/PartSource.Data/Nexpart/Engines.cs
+++ b/PartSource.Data/Nexpart/Engines.cs
@@ -8,10 +8,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class Engines
   {
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public Engine[] Engine;
   }
 }
diff --git a/PartSource.Data/Nexpart/Exceptions.cs b/PartSource.Data/Nexpart/Exceptions.cs
index 2594481..e081fdf 100644
--- a/PartSource.Data/Nexpart/Exceptions.cs
+++ b/PartSource.Data/Nexpart/Exceptions.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/header/parts")]
   public class Exceptions
   {
     [XmlAttribute(AttributeName = "code")]
diff --git a/PartSource.Data/Nexpart/Item.cs b/PartSource.Data/Nexpart/Item.cs
index e9a4b00..14406db 100644
--- a/PartSource.Data/Nexpart/Item.cs
+++ b/PartSource.Data/Nexpart/Item.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
   public class Item
   {
     [XmlAttribute]
diff --git a/PartSource.Data/Nexpart/Items.cs b/PartSource.Data/Nexpart/Items.cs
index ee3d888..bd93d8d 100644
--- a/PartSource.Data/Nexpart/Items.cs
+++ b/PartSource.Data/Nexpart/Items.cs
@@ -8,10 +8,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class Items
     {
-        [XmlElement(ElementName = "Item", Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21", Order = 1)]
+        [XmlElement(ElementName = "Item", Namespace = "http://whisolutions.com/pss/common/helper/parts", Order = 1)]
         public PartSource.Data.Nexpart.Item[] Item { get; set; }
     }
 }
diff --git a/PartSource.Data/Nexpart/Make.cs b/PartSource.Data/Nexpart/Make.cs
index fd48574..5b1a4ba 100644
--- a/PartSource.Data/Nexpart/Make.cs
+++ b/PartSource.Data/Nexpart/Make.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
   public class Make
   {
     [XmlText]
diff --git a/PartSource.Data/Nexpart/MakeSearch.cs b/PartSource.Data/Nexpart/MakeSearch.cs
index 6dec0ce..4bd441a 100644
--- a/PartSource.Data/Nexpart/MakeSearch.cs
+++ b/PartSource.Data/Nexpart/MakeSearch.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class MakeSearch
   {
     public MakeSearch()
@@ -18,16 +18,16 @@ namespace PartSource.Data.Nexpart
       this.RegionId = new int[]{ 2 };
     }
 
-    [XmlElement(ElementName = "PSRequestHeader", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 1)]
+    [XmlElement(ElementName = "PSRequestHeader", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 1)]
     public PSRequestHeader PSRequestHeader { get; set; }
 
-    [XmlElement(ElementName = "Years", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 2)]
+    [XmlElement(ElementName = "Years", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 2)]
     public Years Years { get; set; }
 
-    [XmlElement(ElementName = "RegionId", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 3)]
+    [XmlElement(ElementName = "RegionId", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 3)]
     public int[] RegionId { get; set; }
 
-    [XmlElement(ElementName = "VehicleTypeId", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 4)]
+    [XmlElement(ElementName = "VehicleTypeId", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 4)]
     public int[] VehicleTypeId { get; set; }
   }
 }
diff --git a/PartSource.Data/Nexpart/MakeSearchResponse.cs b/PartSource.Data/Nexpart/MakeSearchResponse.cs
index 9337679..b362e73 100644
--- a/PartSource.Data/Nexpart/MakeSearchResponse.cs
+++ b/PartSource.Data/Nexpart/MakeSearchResponse.cs
@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class MakeSearchResponse : IResponseElement<Makes>
   {
     [XmlElement]
diff --git a/PartSource.Data/Nexpart/Makes.cs b/PartSource.Data/Nexpart/Makes.cs
index 18d87a3..1d53157 100644
--- a/PartSource.Data/Nexpart/Makes.cs
+++ b/PartSource.Data/Nexpart/Makes.cs
@@ -8,10 +8,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class Makes
   {
-    [XmlElement(ElementName = "Make", Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21", Order = 1)]
+    [XmlElement(ElementName = "Make", Namespace = "http://whisolutions.com/pss/common/helper/parts", Order = 1)]
     public PartSource.Data.Nexpart.Make[] Make { get; set; }
   }
 }
diff --git a/PartSource.Data/Nexpart/MenuNode.cs b/PartSource.Data/Nexpart/MenuNode.cs
index 794921a..ef39a3e 100644
--- a/PartSource.Data/Nexpart/MenuNode.cs
+++ b/PartSource.Data/Nexpart/MenuNode.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class MenuNode
     {
         [XmlAttribute]
diff --git a/PartSource.Data/Nexpart/MenuNodes.cs b/PartSource.Data/Nexpart/MenuNodes.cs
index f6c8c63..f2166f8 100644
--- a/PartSource.Data/Nexpart/MenuNodes.cs
+++ b/PartSource.Data/Nexpart/MenuNodes.cs
@@ -8,10 +8,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class MenuNodes
     {
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public MenuNode[] MenuNode{ get; set; }
     }
 }
diff --git a/PartSource.Data/Nexpart/MenuNodesLookup.cs b/PartSource.Data/Nexpart/MenuNodesLookup.cs
index 5e03f10..b990541 100644
--- a/PartSource.Data/Nexpart/MenuNodesLookup.cs
+++ b/PartSource.Data/Nexpart/MenuNodesLookup.cs
@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class MenuNodesLookup
     {
         public MenuNodesLookup()
diff --git a/PartSource.Data/Nexpart/MenuNodesLookupResponse.cs b/PartSource.Data/Nexpart/MenuNodesLookupResponse.cs
index 16c74ae..46f0e8b 100644
--- a/PartSource.Data/Nexpart/MenuNodesLookupResponse.cs
+++ b/PartSource.Data/Nexpart/MenuNodesLookupResponse.cs
@@ -3,7 +3,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class MenuNodesLookupResponse : IResponseElement<MenuNodes>
     {
         [XmlElement]
diff --git a/PartSource.Data/Nexpart/Model.cs b/PartSource.Data/Nexpart/Model.cs
index af901c3..c5d33cc 100644
--- a/PartSource.Data/Nexpart/Model.cs
+++ b/PartSource.Data/Nexpart/Model.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
   public class Model
   {
     [XmlText]
diff --git a/PartSource.Data/Nexpart/ModelSearch.cs b/PartSource.Data/Nexpart/ModelSearch.cs
index 9c13a71..2c5596c 100644
--- a/PartSource.Data/Nexpart/ModelSearch.cs
+++ b/PartSource.Data/Nexpart/ModelSearch.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class ModelSearch
   {
     public ModelSearch()
@@ -17,19 +17,19 @@ namespace PartSource.Data.Nexpart
       this.RegionId = new int[] { 2 };
     }
 
-    [XmlElement(ElementName = "PSRequestHeader", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 1)]
+    [XmlElement(ElementName = "PSRequestHeader", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 1)]
     public PSRequestHeader PSRequestHeader { get; set; }
 
-    [XmlElement(ElementName = "Year", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 2)]
+    [XmlElement(ElementName = "Year", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 2)]
     public int Year { get; set; }
 
-    [XmlElement(ElementName = "MakeId", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 3)]
+    [XmlElement(ElementName = "MakeId", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 3)]
     public int MakeId { get; set; }
 
-    [XmlElement(ElementName = "RegionId", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 4)]
+    [XmlElement(ElementName = "RegionId", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 4)]
     public int[] RegionId { get; set; }
 
-    [XmlElement(ElementName = "VehicleTypeId", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 5)]
+    [XmlElement(ElementName = "VehicleTypeId", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 5)]
     public int[] VehicleTypeId { get; set; }
   }
 }
diff --git a/PartSource.Data/Nexpart/ModelSearchResponse.cs b/PartSource.Data/Nexpart/ModelSearchResponse.cs
index af77cee..37c57f7 100644
--- a/PartSource.Data/Nexpart/ModelSearchResponse.cs
+++ b/PartSource.Data/Nexpart/ModelSearchResponse.cs
@@ -9,13 +9,13 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class ModelSearchResponse : IResponseElement<Models[]>
   {
     [XmlElement]
     public PSResponseHeader PSResponseHeader { get; set; }
 
-    [XmlElement(ElementName = "Models", Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlElement(ElementName = "Models", Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public Models[] ResponseBody { get; set; }
   }
 }
diff --git a/PartSource.Data/Nexpart/Models.cs b/PartSource.Data/Nexpart/Models.cs
index 9c01ea2..222e82a 100644
--- a/PartSource.Data/Nexpart/Models.cs
+++ b/PartSource.Data/Nexpart/Models.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class Models
   {
         public Models()
@@ -19,7 +19,7 @@ namespace PartSource.Data.Nexpart
     [XmlAttribute]
     public int Region { get; set; }
 
-    [XmlElement(ElementName = "Model", Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlElement(ElementName = "Model", Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public PartSource.Data.Nexpart.Model[] Model { get; set; }
   }
 }
diff --git a/PartSource.Data/Nexpart/PSRequestHeader.cs b/PartSource.Data/Nexpart/PSRequestHeader.cs
index f5497e5..7f3a7ae 100644
--- a/PartSource.Data/Nexpart/PSRequestHeader.cs
+++ b/PartSource.Data/Nexpart/PSRequestHeader.cs
@@ -8,19 +8,19 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class PSRequestHeader
   {
     public PSRequestHeader()
     {
-      this.SvcVersion = "1.0";
+      this.SvcVersion = "2.0";
       this.ReturnWarnings = "true";
     }
 
-    [XmlElement(ElementName = "SvcVersion", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "SvcVersion", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public string SvcVersion { get; set; }
 
-    [XmlElement(ElementName = "ReturnWarnings", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "ReturnWarnings", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public string ReturnWarnings { get; set; }
   }
 }
diff --git a/PartSource.Data/Nexpart/PSResponseHeader.cs b/PartSource.Data/Nexpart/PSResponseHeader.cs
index 9967d02..481f4c0 100644
--- a/PartSource.Data/Nexpart/PSResponseHeader.cs
+++ b/PartSource.Data/Nexpart/PSResponseHeader.cs
@@ -8,25 +8,25 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class PSResponseHeader
   {
-    [XmlElement(ElementName = "RequestId", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "RequestId", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public string RequestId { get; set; }
 
-    [XmlElement(ElementName = "RequestProcessingTime", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "RequestProcessingTime", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public string RequestProcessingTime { get; set; }
 
-    [XmlElement(ElementName = "Build", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "Build", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public string Build { get; set; }
 
-    [XmlElement(ElementName = "TimeStamp", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "TimeStamp", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public string TimeStamp { get; set; }
 
-    [XmlElement(ElementName = "StatusCode", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "StatusCode", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public string StatusCode { get; set; }
 
-    [XmlElement(ElementName = "Exceptions", Namespace = "http://whisolutions.com/PartSelectCommon/2011-07-21")]
+    [XmlElement(ElementName = "Exceptions", Namespace = "http://whisolutions.com/pss/common/header/parts")]
     public PartSource.Data.Nexpart.Exceptions[] Exceptions { get; set; }
   }
 }
diff --git a/PartSource.Data/Nexpart/Part.cs b/PartSource.Data/Nexpart/Part.cs
index f6cfc75..b1bd4e2 100644
--- a/PartSource.Data/Nexpart/Part.cs
+++ b/PartSource.Data/Nexpart/Part.cs
@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class Part
 	{
         [XmlElement]
@@ -15,7 +15,7 @@ namespace PartSource.Data.Nexpart
         public PartPartType PartType { get; set; }
 
             // There are two different kinds of PartType because of course there are...
-        [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public class PartPartType
         {
             [XmlAttribute]
diff --git a/PartSource.Data/Nexpart/PartNumber.cs b/PartSource.Data/Nexpart/PartNumber.cs
index 42ceeea..05cdcea 100644
--- a/PartSource.Data/Nexpart/PartNumber.cs
+++ b/PartSource.Data/Nexpart/PartNumber.cs
@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
 	public class PartNumber
 	{
 		[XmlText]
diff --git a/PartSource.Data/Nexpart/PartType.cs b/PartSource.Data/Nexpart/PartType.cs
index ad179e8..f5acb7f 100644
--- a/PartSource.Data/Nexpart/PartType.cs
+++ b/PartSource.Data/Nexpart/PartType.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class PartType
   {
     [XmlAttribute]
diff --git a/PartSource.Data/Nexpart/PartTypeSearch.cs b/PartSource.Data/Nexpart/PartTypeSearch.cs
index 707b06f..4489511 100644
--- a/PartSource.Data/Nexpart/PartTypeSearch.cs
+++ b/PartSource.Data/Nexpart/PartTypeSearch.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class PartTypeSearch
   {
     public PartTypeSearch()
diff --git a/PartSource.Data/Nexpart/PartTypeSearchResponse.cs b/PartSource.Data/Nexpart/PartTypeSearchResponse.cs
index 0316603..81ac907 100644
--- a/PartSource.Data/Nexpart/PartTypeSearchResponse.cs
+++ b/PartSource.Data/Nexpart/PartTypeSearchResponse.cs
@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class PartTypeSearchResponse : IResponseElement<PartTypes>
     {
         [XmlElement]
diff --git a/PartSource.Data/Nexpart/PartTypes.cs b/PartSource.Data/Nexpart/PartTypes.cs
index ba5345e..1240b3f 100644
--- a/PartSource.Data/Nexpart/PartTypes.cs
+++ b/PartSource.Data/Nexpart/PartTypes.cs
@@ -8,10 +8,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class PartTypes
   {
-    [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public PartSource.Data.Nexpart.PartType[] PartType { get; set; }
   }
 }
diff --git a/PartSource.Data/Nexpart/PartTypesValidateLookup.cs b/PartSource.Data/Nexpart/PartTypesValidateLookup.cs
index 0cde0d3..ab73f4b 100644
--- a/PartSource.Data/Nexpart/PartTypesValidateLookup.cs
+++ b/PartSource.Data/Nexpart/PartTypesValidateLookup.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class PartTypesValidateLookup
     {
         public PartTypesValidateLookup()
diff --git a/PartSource.Data/Nexpart/PartTypesValidateLookupResponse.cs b/PartSource.Data/Nexpart/PartTypesValidateLookupResponse.cs
index 116169a..0433467 100644
--- a/PartSource.Data/Nexpart/PartTypesValidateLookupResponse.cs
+++ b/PartSource.Data/Nexpart/PartTypesValidateLookupResponse.cs
@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class PartTypesValidateLookupResponse : IResponseElement<PartTypes>
   {
     [XmlElement]
diff --git a/PartSource.Data/Nexpart/PrimaryImg.cs b/PartSource.Data/Nexpart/PrimaryImg.cs
index fb0dfdc..9e15b5f 100644
--- a/PartSource.Data/Nexpart/PrimaryImg.cs
+++ b/PartSource.Data/Nexpart/PrimaryImg.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
   public class PrimaryImg
   {
     [XmlElement]
diff --git a/PartSource.Data/Nexpart/Region.cs b/PartSource.Data/Nexpart/Region.cs
index bb5513a..f023b51 100644
--- a/PartSource.Data/Nexpart/Region.cs
+++ b/PartSource.Data/Nexpart/Region.cs
@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class Region
     {
         [XmlAttribute]
diff --git a/PartSource.Data/Nexpart/RegionId.cs b/PartSource.Data/Nexpart/RegionId.cs
index de0f944..e19ebc2 100644
--- a/PartSource.Data/Nexpart/RegionId.cs
+++ b/PartSource.Data/Nexpart/RegionId.cs
@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+	[XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
 	public class RegionId
 	{
 		[XmlText]
diff --git a/PartSource.Data/Nexpart/ResultOption.cs b/PartSource.Data/Nexpart/ResultOption.cs
index c26ccbd..9d71f27 100644
--- a/PartSource.Data/Nexpart/ResultOption.cs
+++ b/PartSource.Data/Nexpart/ResultOption.cs
@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class ResultOption
     {
         [XmlText]
diff --git a/PartSource.Data/Nexpart/SmartPageDataSearch.cs b/PartSource.Data/Nexpart/SmartPageDataSearch.cs
index f85f0b0..5831ff8 100644
--- a/PartSource.Data/Nexpart/SmartPageDataSearch.cs
+++ b/PartSource.Data/Nexpart/SmartPageDataSearch.cs
@@ -2,7 +2,7 @@
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class SmartPageDataSearch
     {
         public SmartPageDataSearch()
@@ -10,15 +10,15 @@ namespace PartSource.Data.Nexpart
             PSRequestHeader = new PSRequestHeader();
         }
 
-        [XmlElement(ElementName = "PSRequestHeader", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 1)]
+        [XmlElement(ElementName = "PSRequestHeader", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 1)]
         public PSRequestHeader PSRequestHeader { get; set; }
 
         
-        [XmlElement(ElementName = "Item", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 2)]
+        [XmlElement(ElementName = "Item", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 2)]
         public Item[] Items { get; set; }
 
        
-        [XmlElement(ElementName = "DataOption", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 3)]
+        [XmlElement(ElementName = "DataOption", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 3)]
         public string[] DataOption { get; set; }
     }
 }
diff --git a/PartSource.Data/Nexpart/SmartPageDataSearchResponse.cs b/PartSource.Data/Nexpart/SmartPageDataSearchResponse.cs
index 28b3f44..28f2550 100644
--- a/PartSource.Data/Nexpart/SmartPageDataSearchResponse.cs
+++ b/PartSource.Data/Nexpart/SmartPageDataSearchResponse.cs
@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class SmartPageDataSearchResponse : IResponseElement<Items>
   {
     [XmlElement]
diff --git a/PartSource.Data/Nexpart/SubModel.cs b/PartSource.Data/Nexpart/SubModel.cs
index 366ee88..a9c4496 100644
--- a/PartSource.Data/Nexpart/SubModel.cs
+++ b/PartSource.Data/Nexpart/SubModel.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class SubModel
     {
         [XmlAttribute]
diff --git a/PartSource.Data/Nexpart/SubModelSearchResponse.cs b/PartSource.Data/Nexpart/SubModelSearchResponse.cs
index 5b2f7e1..ca17cb3 100644
--- a/PartSource.Data/Nexpart/SubModelSearchResponse.cs
+++ b/PartSource.Data/Nexpart/SubModelSearchResponse.cs
@@ -6,7 +6,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class SubModelSearchResponse : IResponseElement<SubModels>
     {
         [XmlElement]
diff --git a/PartSource.Data/Nexpart/SubModels.cs b/PartSource.Data/Nexpart/SubModels.cs
index a2ba80b..7b64ea0 100644
--- a/PartSource.Data/Nexpart/SubModels.cs
+++ b/PartSource.Data/Nexpart/SubModels.cs
@@ -5,10 +5,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class SubModels
     {
-            [XmlElement(ElementName = "SubModel", Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21", Order = 1)]
+            [XmlElement(ElementName = "SubModel", Namespace = "http://whisolutions.com/pss/common/helper/parts", Order = 1)]
             public SubModel[] SubModel { get; set; }
     }
 }
diff --git a/PartSource.Data/Nexpart/SubModelsSearch.cs b/PartSource.Data/Nexpart/SubModelsSearch.cs
index 6e7813a..091b16a 100644
--- a/PartSource.Data/Nexpart/SubModelsSearch.cs
+++ b/PartSource.Data/Nexpart/SubModelsSearch.cs
@@ -2,7 +2,7 @@
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class SubModelSearch
     {
         public SubModelSearch()
diff --git a/PartSource.Data/Nexpart/VehicleDetail.cs b/PartSource.Data/Nexpart/VehicleDetail.cs
index 315d311..6718eb9 100644
--- a/PartSource.Data/Nexpart/VehicleDetail.cs
+++ b/PartSource.Data/Nexpart/VehicleDetail.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class VehicleDetail
     {
         [XmlAttribute]
@@ -32,7 +32,7 @@ namespace PartSource.Data.Nexpart
         [XmlAttribute]
         public int VehicleToEngineConfigId { get; set; }
 
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public BaseVehicle BaseVehicle { get; set; }
     }
 }
diff --git a/PartSource.Data/Nexpart/VehicleIdSearch.cs b/PartSource.Data/Nexpart/VehicleIdSearch.cs
index 46ebad0..29b2ec1 100644
--- a/PartSource.Data/Nexpart/VehicleIdSearch.cs
+++ b/PartSource.Data/Nexpart/VehicleIdSearch.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class VehicleIdSearch
     {
         public VehicleIdSearch()
diff --git a/PartSource.Data/Nexpart/VehicleIdSearchResponse.cs b/PartSource.Data/Nexpart/VehicleIdSearchResponse.cs
index b96ade7..7548250 100644
--- a/PartSource.Data/Nexpart/VehicleIdSearchResponse.cs
+++ b/PartSource.Data/Nexpart/VehicleIdSearchResponse.cs
@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class VehicleIdSearchResponse : IResponseElement<VehicleDetail>
   {
     [XmlElement]
diff --git a/PartSource.Data/Nexpart/VehicleIdentifier.cs b/PartSource.Data/Nexpart/VehicleIdentifier.cs
index b292248..c1ec837 100644
--- a/PartSource.Data/Nexpart/VehicleIdentifier.cs
+++ b/PartSource.Data/Nexpart/VehicleIdentifier.cs
@@ -8,13 +8,13 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class VehicleIdentifier
     {
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public int BaseVehicleId { get; set; }
 
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public int EngineConfigId { get; set; }
 
         public bool ShouldSerializeBaseVehicleId()
diff --git a/PartSource.Data/Nexpart/VehicleType.cs b/PartSource.Data/Nexpart/VehicleType.cs
index ac7fa9a..309816c 100644
--- a/PartSource.Data/Nexpart/VehicleType.cs
+++ b/PartSource.Data/Nexpart/VehicleType.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
   public class VehicleType
   {
     [XmlText]
diff --git a/PartSource.Data/Nexpart/VehicleTypes.cs b/PartSource.Data/Nexpart/VehicleTypes.cs
index 004d989..bf6e59d 100644
--- a/PartSource.Data/Nexpart/VehicleTypes.cs
+++ b/PartSource.Data/Nexpart/VehicleTypes.cs
@@ -8,10 +8,10 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class VehicleTypes
   {
-    [XmlElement(ElementName = "VehicleType", Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21", Order = 1)]
+    [XmlElement(ElementName = "VehicleType", Namespace = "http://whisolutions.com/pss/common/helper/parts", Order = 1)]
     public PartSource.Data.Nexpart.VehicleType[] VehicleType { get; set; }
   }
 }
diff --git a/PartSource.Data/Nexpart/VehicleTypesGet.cs b/PartSource.Data/Nexpart/VehicleTypesGet.cs
index 82e8b0e..c582be6 100644
--- a/PartSource.Data/Nexpart/VehicleTypesGet.cs
+++ b/PartSource.Data/Nexpart/VehicleTypesGet.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class VehicleTypesGet
   {
     public VehicleTypesGet()
@@ -16,7 +16,7 @@ namespace PartSource.Data.Nexpart
       this.PSRequestHeader = new PSRequestHeader();
     }
 
-    [XmlElement(ElementName = "PSRequestHeader", Namespace = "http://whisolutions.com/PartSelectService-v1", Order = 1)]
+    [XmlElement(ElementName = "PSRequestHeader", Namespace = "http://whisolutions.com/pss/common/model/parts", Order = 1)]
     public PSRequestHeader PSRequestHeader { get; set; }
   }
 }
diff --git a/PartSource.Data/Nexpart/VehicleTypesGetResponse.cs b/PartSource.Data/Nexpart/VehicleTypesGetResponse.cs
index a550513..46484b4 100644
--- a/PartSource.Data/Nexpart/VehicleTypesGetResponse.cs
+++ b/PartSource.Data/Nexpart/VehicleTypesGetResponse.cs
@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class VehicleTypesGetResponse : IResponseElement<VehicleTypes>
   {
     [XmlElement]
diff --git a/PartSource.Data/Nexpart/WHIEngine.cs b/PartSource.Data/Nexpart/WHIEngine.cs
index ddad15c..43547ad 100644
--- a/PartSource.Data/Nexpart/WHIEngine.cs
+++ b/PartSource.Data/Nexpart/WHIEngine.cs
@@ -2,7 +2,7 @@
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/helper/parts")]
     public class WHIEngine
     {
         [XmlAttribute]
diff --git a/PartSource.Data/Nexpart/WHIEngineSearch.cs b/PartSource.Data/Nexpart/WHIEngineSearch.cs
index 06bab14..0884144 100644
--- a/PartSource.Data/Nexpart/WHIEngineSearch.cs
+++ b/PartSource.Data/Nexpart/WHIEngineSearch.cs
@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class WHIEngineSearch
     {
         public WHIEngineSearch()
diff --git a/PartSource.Data/Nexpart/WHIEngineSearchResponse.cs b/PartSource.Data/Nexpart/WHIEngineSearchResponse.cs
index ff6d027..2df44c8 100644
--- a/PartSource.Data/Nexpart/WHIEngineSearchResponse.cs
+++ b/PartSource.Data/Nexpart/WHIEngineSearchResponse.cs
@@ -6,7 +6,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class WHIEngineSearchResponse : IResponseElement<WHIEngines>
     {
         [XmlElement]
diff --git a/PartSource.Data/Nexpart/WHIEngines.cs b/PartSource.Data/Nexpart/WHIEngines.cs
index 6b7e2d6..94adfeb 100644
--- a/PartSource.Data/Nexpart/WHIEngines.cs
+++ b/PartSource.Data/Nexpart/WHIEngines.cs
@@ -2,10 +2,10 @@
 
 namespace PartSource.Data.Nexpart
 {
-    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+    [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
     public class WHIEngines
     {
-        [XmlElement(Namespace = "http://whisolutions.com/PartSelectServ/2011-07-21")]
+        [XmlElement(Namespace = "http://whisolutions.com/pss/common/helper/parts")]
         public WHIEngine[] WHIEngine;
     }
 }
diff --git a/PartSource.Data/Nexpart/Years.cs b/PartSource.Data/Nexpart/Years.cs
index 2202041..2aba94c 100644
--- a/PartSource.Data/Nexpart/Years.cs
+++ b/PartSource.Data/Nexpart/Years.cs
@@ -8,7 +8,7 @@ using System.Xml.Serialization;
 
 namespace PartSource.Data.Nexpart
 {
-  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/PartSelectService-v1")]
+  [XmlType(AnonymousType = true, Namespace = "http://whisolutions.com/pss/common/model/parts")]
   public class Years
   {
     [XmlAttribute(AttributeName = "to")]
diff --git a/PartSource.Services/NexpartService.cs b/PartSource.Services/NexpartService.cs
index c0c24d3..8e5641c 100644
--- a/PartSource.Services/NexpartService.cs
+++ b/PartSource.Services/NexpartService.cs
@@ -32,7 +32,7 @@ namespace PartSource.Services
 					try
 					{
 						//HttpResponseMessage response = await client.PostAsync(ConfigurationManager.AppSettings["NexpartUrl"], (HttpContent)new StringContent(sb.ToString(), Encoding.UTF8, "text/xml"));
-						HttpResponseMessage response = await client.PostAsync("http://acespssprod.nexpart.com:8081/partselect/1.0/services/PartSelectService.PartSelectHttpSoap11Endpoint/", new StringContent(textWriter.ToString(), Encoding.UTF8));
+						HttpResponseMessage response = await client.PostAsync("https://acespssprod.nexpart.com:4085/partselect/2.0/services/PartSelectService.PartSelectHttpSoap11Endpoint", new StringContent(textWriter.ToString(), Encoding.UTF8, "text/xml"));
 						Stream result = await response.Content.ReadAsStreamAsync();
 						string str = await response.Content.ReadAsStringAsync();