diff --git a/.vs/IO.ClickSend/FileContentIndex/285f7250-cf60-4b5b-868d-189ef8b73e11.vsidx b/.vs/IO.ClickSend/FileContentIndex/285f7250-cf60-4b5b-868d-189ef8b73e11.vsidx
new file mode 100644
index 0000000..c665471
Binary files /dev/null and b/.vs/IO.ClickSend/FileContentIndex/285f7250-cf60-4b5b-868d-189ef8b73e11.vsidx differ
diff --git a/.vs/IO.ClickSend/FileContentIndex/c14eaf4a-17cc-407b-9032-3dff0a277dd0.vsidx b/.vs/IO.ClickSend/FileContentIndex/c14eaf4a-17cc-407b-9032-3dff0a277dd0.vsidx
new file mode 100644
index 0000000..caee88d
Binary files /dev/null and b/.vs/IO.ClickSend/FileContentIndex/c14eaf4a-17cc-407b-9032-3dff0a277dd0.vsidx differ
diff --git a/.vs/IO.ClickSend/FileContentIndex/c18f0c91-7bbd-46a1-aaef-c32a346beeb7.vsidx b/.vs/IO.ClickSend/FileContentIndex/c18f0c91-7bbd-46a1-aaef-c32a346beeb7.vsidx
new file mode 100644
index 0000000..6282c9c
Binary files /dev/null and b/.vs/IO.ClickSend/FileContentIndex/c18f0c91-7bbd-46a1-aaef-c32a346beeb7.vsidx differ
diff --git a/.vs/IO.ClickSend/FileContentIndex/read.lock b/.vs/IO.ClickSend/FileContentIndex/read.lock
new file mode 100644
index 0000000..e69de29
diff --git a/IO.ClickSend.sln b/IO.ClickSend.sln
index e85d59b..cd34121 100644
--- a/IO.ClickSend.sln
+++ b/IO.ClickSend.sln
@@ -1,8 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-VisualStudioVersion = 12.0.0.0
-MinimumVisualStudioVersion = 10.0.0.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.ClickSend", "src\IO.ClickSend\IO.ClickSend.csproj", "{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}"
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33213.308
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.ClickSend", "src\IO.ClickSend\IO.ClickSend.csproj", "{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.ClickSend.Test", "src\IO.ClickSend.Test\IO.ClickSend.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
 EndProject
@@ -12,10 +12,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -24,4 +24,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-EndGlobal
\ No newline at end of file
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {45787408-9147-49F5-8D7D-861030BDB7AF}
+	EndGlobalSection
+EndGlobal
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/AccountApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/AccountApiTests.cs
index 8888992..a710097 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/AccountApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/AccountApiTests.cs
@@ -14,11 +14,11 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class AccountApiTests
     {
         private AccountApi instance;
@@ -37,7 +37,7 @@ public class AccountApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new AccountApi();
@@ -46,7 +46,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +55,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of AccountApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' AccountApi
@@ -65,7 +65,7 @@ public void InstanceTest()
         /// <summary>
         /// Test AccountGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccountGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -75,7 +75,7 @@ public void AccountGetTest()
         /// <summary>
         /// Test AccountPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccountPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -86,7 +86,7 @@ public void AccountPostTest()
         /// <summary>
         /// Test AccountUseageBySubaccountGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccountUseageBySubaccountGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -98,7 +98,7 @@ public void AccountUseageBySubaccountGetTest()
         /// <summary>
         /// Test AccountVerifySendPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccountVerifySendPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -109,7 +109,7 @@ public void AccountVerifySendPutTest()
         /// <summary>
         /// Test AccountVerifyVerifyByActivationTokenPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccountVerifyVerifyByActivationTokenPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -120,7 +120,7 @@ public void AccountVerifyVerifyByActivationTokenPutTest()
         /// <summary>
         /// Test ForgotPasswordPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ForgotPasswordPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -131,7 +131,7 @@ public void ForgotPasswordPutTest()
         /// <summary>
         /// Test ForgotPasswordVerifyPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ForgotPasswordVerifyPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -142,7 +142,7 @@ public void ForgotPasswordVerifyPutTest()
         /// <summary>
         /// Test ForgotUsernamePut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ForgotUsernamePutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/AccountRechargeApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/AccountRechargeApiTests.cs
index fb84b0a..c35eadd 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/AccountRechargeApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/AccountRechargeApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class AccountRechargeApiTests
     {
         private AccountRechargeApi instance;
@@ -37,7 +38,7 @@ public class AccountRechargeApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new AccountRechargeApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of AccountRechargeApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' AccountRechargeApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test RechargeCreditCardGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void RechargeCreditCardGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -75,7 +76,7 @@ public void RechargeCreditCardGetTest()
         /// <summary>
         /// Test RechargeCreditCardPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void RechargeCreditCardPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -86,7 +87,7 @@ public void RechargeCreditCardPutTest()
         /// <summary>
         /// Test RechargePackagesGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void RechargePackagesGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -97,7 +98,7 @@ public void RechargePackagesGetTest()
         /// <summary>
         /// Test RechargePurchaseByPackageIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void RechargePurchaseByPackageIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -108,7 +109,7 @@ public void RechargePurchaseByPackageIdPutTest()
         /// <summary>
         /// Test RechargeTransactionsByTransactionIdGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void RechargeTransactionsByTransactionIdGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -119,7 +120,7 @@ public void RechargeTransactionsByTransactionIdGetTest()
         /// <summary>
         /// Test RechargeTransactionsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void RechargeTransactionsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/ContactApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/ContactApiTests.cs
index 6dddaa6..ef9b6d5 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/ContactApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/ContactApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class ContactApiTests
     {
         private ContactApi instance;
@@ -37,7 +38,7 @@ public class ContactApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new ContactApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of ContactApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' ContactApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test ListsContactsByListIdAndContactIdDelete
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsContactsByListIdAndContactIdDeleteTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -77,7 +78,7 @@ public void ListsContactsByListIdAndContactIdDeleteTest()
         /// <summary>
         /// Test ListsContactsByListIdAndContactIdGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsContactsByListIdAndContactIdGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -89,7 +90,7 @@ public void ListsContactsByListIdAndContactIdGetTest()
         /// <summary>
         /// Test ListsContactsByListIdAndContactIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsContactsByListIdAndContactIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -102,7 +103,7 @@ public void ListsContactsByListIdAndContactIdPutTest()
         /// <summary>
         /// Test ListsContactsByListIdGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsContactsByListIdGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -116,7 +117,7 @@ public void ListsContactsByListIdGetTest()
         /// <summary>
         /// Test ListsContactsByListIdPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsContactsByListIdPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -128,7 +129,7 @@ public void ListsContactsByListIdPostTest()
         /// <summary>
         /// Test ListsCopyContactPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsCopyContactPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -141,7 +142,7 @@ public void ListsCopyContactPutTest()
         /// <summary>
         /// Test ListsRemoveOptedOutContactsByListIdAndOptOutListIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsRemoveOptedOutContactsByListIdAndOptOutListIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -153,7 +154,7 @@ public void ListsRemoveOptedOutContactsByListIdAndOptOutListIdPutTest()
         /// <summary>
         /// Test ListsTransferContactPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsTransferContactPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/ContactListApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/ContactListApiTests.cs
index 966fe89..cc54f8d 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/ContactListApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/ContactListApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class ContactListApiTests
     {
         private ContactListApi instance;
@@ -37,7 +38,7 @@ public class ContactListApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new ContactListApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of ContactListApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' ContactListApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test ListsByListIdDelete
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsByListIdDeleteTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void ListsByListIdDeleteTest()
         /// <summary>
         /// Test ListsByListIdGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsByListIdGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -87,7 +88,7 @@ public void ListsByListIdGetTest()
         /// <summary>
         /// Test ListsByListIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsByListIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -99,7 +100,7 @@ public void ListsByListIdPutTest()
         /// <summary>
         /// Test ListsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -111,7 +112,7 @@ public void ListsGetTest()
         /// <summary>
         /// Test ListsImportByListIdPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsImportByListIdPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -123,7 +124,7 @@ public void ListsImportByListIdPostTest()
         /// <summary>
         /// Test ListsPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -134,7 +135,7 @@ public void ListsPostTest()
         /// <summary>
         /// Test ListsRemoveDuplicatesByListIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListsRemoveDuplicatesByListIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/CountriesApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/CountriesApiTests.cs
index 2c9a853..83ddc7e 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/CountriesApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/CountriesApiTests.cs
@@ -14,10 +14,11 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -28,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class CountriesApiTests
     {
         private CountriesApi instance;
@@ -36,7 +37,7 @@ public class CountriesApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new CountriesApi();
@@ -45,7 +46,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -54,7 +55,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of CountriesApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' CountriesApi
@@ -64,7 +65,7 @@ public void InstanceTest()
         /// <summary>
         /// Test CountriesGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CountriesGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/DeliveryIssuesApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/DeliveryIssuesApiTests.cs
index e6d4ce5..fd9d4b9 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/DeliveryIssuesApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/DeliveryIssuesApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class DeliveryIssuesApiTests
     {
         private DeliveryIssuesApi instance;
@@ -37,7 +38,7 @@ public class DeliveryIssuesApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new DeliveryIssuesApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of DeliveryIssuesApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' DeliveryIssuesApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test DeliveryIssuesGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void DeliveryIssuesGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -77,7 +78,7 @@ public void DeliveryIssuesGetTest()
         /// <summary>
         /// Test DeliveryIssuesPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void DeliveryIssuesPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/DetectAddressApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/DetectAddressApiTests.cs
index bf111ff..8bbb4f9 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/DetectAddressApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/DetectAddressApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class DetectAddressApiTests
     {
         private DetectAddressApi instance;
@@ -37,7 +38,7 @@ public class DetectAddressApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new DetectAddressApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of DetectAddressApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' DetectAddressApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test DetectAddressPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void DetectAddressPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/EmailDeliveryReceiptRulesApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/EmailDeliveryReceiptRulesApiTests.cs
index 39bfeb6..a4ec4e6 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/EmailDeliveryReceiptRulesApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/EmailDeliveryReceiptRulesApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class EmailDeliveryReceiptRulesApiTests
     {
         private EmailDeliveryReceiptRulesApi instance;
@@ -37,7 +38,7 @@ public class EmailDeliveryReceiptRulesApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new EmailDeliveryReceiptRulesApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of EmailDeliveryReceiptRulesApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' EmailDeliveryReceiptRulesApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test EmailDeliveryReceiptAutomationDelete
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailDeliveryReceiptAutomationDeleteTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void EmailDeliveryReceiptAutomationDeleteTest()
         /// <summary>
         /// Test EmailDeliveryReceiptAutomationGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailDeliveryReceiptAutomationGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -87,7 +88,7 @@ public void EmailDeliveryReceiptAutomationGetTest()
         /// <summary>
         /// Test EmailDeliveryReceiptAutomationPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailDeliveryReceiptAutomationPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -98,7 +99,7 @@ public void EmailDeliveryReceiptAutomationPostTest()
         /// <summary>
         /// Test EmailDeliveryReceiptAutomationPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailDeliveryReceiptAutomationPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -110,7 +111,7 @@ public void EmailDeliveryReceiptAutomationPutTest()
         /// <summary>
         /// Test EmailDeliveryReceiptAutomationsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailDeliveryReceiptAutomationsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/EmailMarketingApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/EmailMarketingApiTests.cs
index 43284ad..3f44a51 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/EmailMarketingApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/EmailMarketingApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class EmailMarketingApiTests
     {
         private EmailMarketingApi instance;
@@ -37,7 +38,7 @@ public class EmailMarketingApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new EmailMarketingApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of EmailMarketingApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' EmailMarketingApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test AllowedEmailAddressGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AllowedEmailAddressGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -77,7 +78,7 @@ public void AllowedEmailAddressGetTest()
         /// <summary>
         /// Test AllowedEmailAddressPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AllowedEmailAddressPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -88,7 +89,7 @@ public void AllowedEmailAddressPostTest()
         /// <summary>
         /// Test CancelEmailCampaignPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CancelEmailCampaignPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -99,7 +100,7 @@ public void CancelEmailCampaignPutTest()
         /// <summary>
         /// Test EmailCampaignGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailCampaignGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -110,7 +111,7 @@ public void EmailCampaignGetTest()
         /// <summary>
         /// Test EmailCampaignHistoryExportGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailCampaignHistoryExportGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -123,7 +124,7 @@ public void EmailCampaignHistoryExportGetTest()
         /// <summary>
         /// Test EmailCampaignHistoryGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailCampaignHistoryGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -138,7 +139,7 @@ public void EmailCampaignHistoryGetTest()
         /// <summary>
         /// Test EmailCampaignPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailCampaignPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -149,7 +150,7 @@ public void EmailCampaignPostTest()
         /// <summary>
         /// Test EmailCampaignPricePost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailCampaignPricePostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -160,7 +161,7 @@ public void EmailCampaignPricePostTest()
         /// <summary>
         /// Test EmailCampaignPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailCampaignPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -172,7 +173,7 @@ public void EmailCampaignPutTest()
         /// <summary>
         /// Test EmailCampaignsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailCampaignsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -184,7 +185,7 @@ public void EmailCampaignsGetTest()
         /// <summary>
         /// Test SendVerificationTokenGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SendVerificationTokenGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -195,7 +196,7 @@ public void SendVerificationTokenGetTest()
         /// <summary>
         /// Test SpecificAllowedEmailAddressDelete
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SpecificAllowedEmailAddressDeleteTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -206,7 +207,7 @@ public void SpecificAllowedEmailAddressDeleteTest()
         /// <summary>
         /// Test SpecificAllowedEmailAddressGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SpecificAllowedEmailAddressGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -217,7 +218,7 @@ public void SpecificAllowedEmailAddressGetTest()
         /// <summary>
         /// Test VerifyAllowedEmailAddressGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VerifyAllowedEmailAddressGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/EmailToSmsApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/EmailToSmsApiTests.cs
index dccf887..b3244da 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/EmailToSmsApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/EmailToSmsApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class EmailToSmsApiTests
     {
         private EmailToSmsApi instance;
@@ -37,7 +38,7 @@ public class EmailToSmsApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new EmailToSmsApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of EmailToSmsApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' EmailToSmsApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test SmsEmailSmsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsEmailSmsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -77,7 +78,7 @@ public void SmsEmailSmsGetTest()
         /// <summary>
         /// Test SmsEmailSmsPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsEmailSmsPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -88,7 +89,7 @@ public void SmsEmailSmsPostTest()
         /// <summary>
         /// Test SmsEmailSmsStrippedStringDelete
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsEmailSmsStrippedStringDeleteTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -99,7 +100,7 @@ public void SmsEmailSmsStrippedStringDeleteTest()
         /// <summary>
         /// Test SmsEmailSmsStrippedStringGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsEmailSmsStrippedStringGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -110,7 +111,7 @@ public void SmsEmailSmsStrippedStringGetTest()
         /// <summary>
         /// Test SmsEmailSmsStrippedStringPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsEmailSmsStrippedStringPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -121,7 +122,7 @@ public void SmsEmailSmsStrippedStringPostTest()
         /// <summary>
         /// Test SmsEmailSmsStrippedStringPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsEmailSmsStrippedStringPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -133,7 +134,7 @@ public void SmsEmailSmsStrippedStringPutTest()
         /// <summary>
         /// Test SmsEmailSmsStrippedStringsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsEmailSmsStrippedStringsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/FAXApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/FAXApiTests.cs
index ba52e55..c3572f2 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/FAXApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/FAXApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class FAXApiTests
     {
         private FAXApi instance;
@@ -37,7 +38,7 @@ public class FAXApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new FAXApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of FAXApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' FAXApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test FaxHistoryGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxHistoryGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -81,7 +82,7 @@ public void FaxHistoryGetTest()
         /// <summary>
         /// Test FaxPricePost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxPricePostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -92,7 +93,7 @@ public void FaxPricePostTest()
         /// <summary>
         /// Test FaxReceiptsByMessageIdGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxReceiptsByMessageIdGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -103,7 +104,7 @@ public void FaxReceiptsByMessageIdGetTest()
         /// <summary>
         /// Test FaxReceiptsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxReceiptsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -115,7 +116,7 @@ public void FaxReceiptsGetTest()
         /// <summary>
         /// Test FaxReceiptsPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxReceiptsPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -126,7 +127,7 @@ public void FaxReceiptsPostTest()
         /// <summary>
         /// Test FaxReceiptsReadPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxReceiptsReadPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -137,7 +138,7 @@ public void FaxReceiptsReadPutTest()
         /// <summary>
         /// Test FaxSendPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxSendPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/FAXDeliveryReceiptRulesApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/FAXDeliveryReceiptRulesApiTests.cs
index 9086f67..87f61a9 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/FAXDeliveryReceiptRulesApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/FAXDeliveryReceiptRulesApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class FAXDeliveryReceiptRulesApiTests
     {
         private FAXDeliveryReceiptRulesApi instance;
@@ -37,7 +38,7 @@ public class FAXDeliveryReceiptRulesApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new FAXDeliveryReceiptRulesApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of FAXDeliveryReceiptRulesApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' FAXDeliveryReceiptRulesApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test FaxDeliveryReceiptAutomationDelete
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxDeliveryReceiptAutomationDeleteTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void FaxDeliveryReceiptAutomationDeleteTest()
         /// <summary>
         /// Test FaxDeliveryReceiptAutomationGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxDeliveryReceiptAutomationGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -87,7 +88,7 @@ public void FaxDeliveryReceiptAutomationGetTest()
         /// <summary>
         /// Test FaxDeliveryReceiptAutomationPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxDeliveryReceiptAutomationPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -98,7 +99,7 @@ public void FaxDeliveryReceiptAutomationPostTest()
         /// <summary>
         /// Test FaxDeliveryReceiptAutomationPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxDeliveryReceiptAutomationPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -110,7 +111,7 @@ public void FaxDeliveryReceiptAutomationPutTest()
         /// <summary>
         /// Test FaxDeliveryReceiptAutomationsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxDeliveryReceiptAutomationsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/GlobalSendingApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/GlobalSendingApiTests.cs
index 9a06e04..dc68c3d 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/GlobalSendingApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/GlobalSendingApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class GlobalSendingApiTests
     {
         private GlobalSendingApi instance;
@@ -37,7 +38,7 @@ public class GlobalSendingApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new GlobalSendingApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of GlobalSendingApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' GlobalSendingApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test ListCountriesGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListCountriesGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -75,7 +76,7 @@ public void ListCountriesGetTest()
         /// <summary>
         /// Test UserCountriesAgreePost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UserCountriesAgreePostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -85,7 +86,7 @@ public void UserCountriesAgreePostTest()
         /// <summary>
         /// Test UserCountriesGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UserCountriesGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -95,7 +96,7 @@ public void UserCountriesGetTest()
         /// <summary>
         /// Test UserCountriesPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UserCountriesPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/InboundFAXRulesApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/InboundFAXRulesApiTests.cs
index 866d60f..ea1dab3 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/InboundFAXRulesApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/InboundFAXRulesApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class InboundFAXRulesApiTests
     {
         private InboundFAXRulesApi instance;
@@ -37,7 +38,7 @@ public class InboundFAXRulesApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new InboundFAXRulesApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of InboundFAXRulesApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' InboundFAXRulesApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test FaxInboundAutomationDelete
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxInboundAutomationDeleteTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void FaxInboundAutomationDeleteTest()
         /// <summary>
         /// Test FaxInboundAutomationGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxInboundAutomationGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -87,7 +88,7 @@ public void FaxInboundAutomationGetTest()
         /// <summary>
         /// Test FaxInboundAutomationPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxInboundAutomationPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -98,7 +99,7 @@ public void FaxInboundAutomationPostTest()
         /// <summary>
         /// Test FaxInboundAutomationPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxInboundAutomationPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -110,7 +111,7 @@ public void FaxInboundAutomationPutTest()
         /// <summary>
         /// Test FaxInboundAutomationsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxInboundAutomationsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/InboundSMSRulesApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/InboundSMSRulesApiTests.cs
index e9ca1fc..fdaa44b 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/InboundSMSRulesApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/InboundSMSRulesApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class InboundSMSRulesApiTests
     {
         private InboundSMSRulesApi instance;
@@ -37,7 +38,7 @@ public class InboundSMSRulesApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new InboundSMSRulesApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of InboundSMSRulesApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' InboundSMSRulesApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test SmsInboundAutomationDelete
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsInboundAutomationDeleteTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void SmsInboundAutomationDeleteTest()
         /// <summary>
         /// Test SmsInboundAutomationGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsInboundAutomationGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -87,7 +88,7 @@ public void SmsInboundAutomationGetTest()
         /// <summary>
         /// Test SmsInboundAutomationPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsInboundAutomationPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -98,7 +99,7 @@ public void SmsInboundAutomationPostTest()
         /// <summary>
         /// Test SmsInboundAutomationPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsInboundAutomationPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -110,7 +111,7 @@ public void SmsInboundAutomationPutTest()
         /// <summary>
         /// Test SmsInboundAutomationsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsInboundAutomationsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/MMSApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/MMSApiTests.cs
index 2e74b6a..e80f363 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/MMSApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/MMSApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class MMSApiTests
     {
         private MMSApi instance;
@@ -37,7 +38,7 @@ public class MMSApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new MMSApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of MMSApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' MMSApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test MmsHistoryExportGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsHistoryExportGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void MmsHistoryExportGetTest()
         /// <summary>
         /// Test MmsHistoryGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsHistoryGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -91,7 +92,7 @@ public void MmsHistoryGetTest()
         /// <summary>
         /// Test MmsPricePost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsPricePostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -102,7 +103,7 @@ public void MmsPricePostTest()
         /// <summary>
         /// Test MmsReceiptsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsReceiptsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -114,7 +115,7 @@ public void MmsReceiptsGetTest()
         /// <summary>
         /// Test MmsReceiptsReadPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsReceiptsReadPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -125,7 +126,7 @@ public void MmsReceiptsReadPutTest()
         /// <summary>
         /// Test MmsSendPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsSendPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/MasterEmailTemplatesApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/MasterEmailTemplatesApiTests.cs
index fab0d98..90a1ece 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/MasterEmailTemplatesApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/MasterEmailTemplatesApiTests.cs
@@ -14,10 +14,11 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -28,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class MasterEmailTemplatesApiTests
     {
         private MasterEmailTemplatesApi instance;
@@ -36,7 +37,7 @@ public class MasterEmailTemplatesApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new MasterEmailTemplatesApi();
@@ -45,7 +46,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -54,7 +55,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of MasterEmailTemplatesApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' MasterEmailTemplatesApi
@@ -64,7 +65,7 @@ public void InstanceTest()
         /// <summary>
         /// Test MasterEmailTemplateCategoriesGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MasterEmailTemplateCategoriesGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void MasterEmailTemplateCategoriesGetTest()
         /// <summary>
         /// Test MasterEmailTemplateCategoryGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MasterEmailTemplateCategoryGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -87,7 +88,7 @@ public void MasterEmailTemplateCategoryGetTest()
         /// <summary>
         /// Test MasterEmailTemplateGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MasterEmailTemplateGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -98,7 +99,7 @@ public void MasterEmailTemplateGetTest()
         /// <summary>
         /// Test MasterEmailTemplatesGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MasterEmailTemplatesGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -110,7 +111,7 @@ public void MasterEmailTemplatesGetTest()
         /// <summary>
         /// Test MasterEmailTemplatesInCategoryGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MasterEmailTemplatesInCategoryGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/MmsCampaignApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/MmsCampaignApiTests.cs
index 78e3f4f..7fdc8e9 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/MmsCampaignApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/MmsCampaignApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class MmsCampaignApiTests
     {
         private MmsCampaignApi instance;
@@ -37,7 +38,7 @@ public class MmsCampaignApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new MmsCampaignApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of MmsCampaignApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' MmsCampaignApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test MmsCampaignByMmsCampaignIdGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsCampaignByMmsCampaignIdGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void MmsCampaignByMmsCampaignIdGetTest()
         /// <summary>
         /// Test MmsCampaignsByMmsCampaignIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsCampaignsByMmsCampaignIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -88,7 +89,7 @@ public void MmsCampaignsByMmsCampaignIdPutTest()
         /// <summary>
         /// Test MmsCampaignsCancelByMmsCampaignIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsCampaignsCancelByMmsCampaignIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -99,7 +100,7 @@ public void MmsCampaignsCancelByMmsCampaignIdPutTest()
         /// <summary>
         /// Test MmsCampaignsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsCampaignsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -111,7 +112,7 @@ public void MmsCampaignsGetTest()
         /// <summary>
         /// Test MmsCampaignsPricePost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsCampaignsPricePostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -122,7 +123,7 @@ public void MmsCampaignsPricePostTest()
         /// <summary>
         /// Test MmsCampaignsSendPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsCampaignsSendPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/NumberApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/NumberApiTests.cs
index 58e9741..4f81505 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/NumberApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/NumberApiTests.cs
@@ -14,10 +14,11 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -28,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class NumberApiTests
     {
         private NumberApi instance;
@@ -36,7 +37,7 @@ public class NumberApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new NumberApi();
@@ -45,7 +46,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -54,7 +55,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of NumberApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' NumberApi
@@ -64,7 +65,7 @@ public void InstanceTest()
         /// <summary>
         /// Test NumbersBuyByDedicatedNumberPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void NumbersBuyByDedicatedNumberPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -75,7 +76,7 @@ public void NumbersBuyByDedicatedNumberPostTest()
         /// <summary>
         /// Test NumbersGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void NumbersGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -87,7 +88,7 @@ public void NumbersGetTest()
         /// <summary>
         /// Test NumbersSearchByCountryGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void NumbersSearchByCountryGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/PostLetterApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/PostLetterApiTests.cs
index ab61584..f13670b 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/PostLetterApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/PostLetterApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class PostLetterApiTests
     {
         private PostLetterApi instance;
@@ -37,7 +38,7 @@ public class PostLetterApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new PostLetterApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of PostLetterApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' PostLetterApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test PostLettersExportGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostLettersExportGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void PostLettersExportGetTest()
         /// <summary>
         /// Test PostLettersHistoryGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostLettersHistoryGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -88,7 +89,7 @@ public void PostLettersHistoryGetTest()
         /// <summary>
         /// Test PostLettersPricePost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostLettersPricePostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -99,7 +100,7 @@ public void PostLettersPricePostTest()
         /// <summary>
         /// Test PostLettersSendPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostLettersSendPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/PostPostcardApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/PostPostcardApiTests.cs
index 67639ec..9e22d54 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/PostPostcardApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/PostPostcardApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class PostPostcardApiTests
     {
         private PostPostcardApi instance;
@@ -37,7 +38,7 @@ public class PostPostcardApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new PostPostcardApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of PostPostcardApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' PostPostcardApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test PostPostcardsHistoryExportGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostPostcardsHistoryExportGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void PostPostcardsHistoryExportGetTest()
         /// <summary>
         /// Test PostPostcardsHistoryGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostPostcardsHistoryGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -88,7 +89,7 @@ public void PostPostcardsHistoryGetTest()
         /// <summary>
         /// Test PostPostcardsPricePost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostPostcardsPricePostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -99,7 +100,7 @@ public void PostPostcardsPricePostTest()
         /// <summary>
         /// Test PostPostcardsSendPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostPostcardsSendPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/PostReturnAddressApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/PostReturnAddressApiTests.cs
index d8e2092..67f3bff 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/PostReturnAddressApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/PostReturnAddressApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class PostReturnAddressApiTests
     {
         private PostReturnAddressApi instance;
@@ -37,7 +38,7 @@ public class PostReturnAddressApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new PostReturnAddressApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of PostReturnAddressApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' PostReturnAddressApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test PostReturnAddressesByReturnAddressIdDelete
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostReturnAddressesByReturnAddressIdDeleteTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void PostReturnAddressesByReturnAddressIdDeleteTest()
         /// <summary>
         /// Test PostReturnAddressesByReturnAddressIdGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostReturnAddressesByReturnAddressIdGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -87,7 +88,7 @@ public void PostReturnAddressesByReturnAddressIdGetTest()
         /// <summary>
         /// Test PostReturnAddressesByReturnAddressIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostReturnAddressesByReturnAddressIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -99,7 +100,7 @@ public void PostReturnAddressesByReturnAddressIdPutTest()
         /// <summary>
         /// Test PostReturnAddressesGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostReturnAddressesGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -111,7 +112,7 @@ public void PostReturnAddressesGetTest()
         /// <summary>
         /// Test PostReturnAddressesPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostReturnAddressesPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/ReferralAccountApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/ReferralAccountApiTests.cs
index 2be712a..c2e027f 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/ReferralAccountApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/ReferralAccountApiTests.cs
@@ -14,10 +14,11 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -28,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class ReferralAccountApiTests
     {
         private ReferralAccountApi instance;
@@ -36,7 +37,7 @@ public class ReferralAccountApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new ReferralAccountApi();
@@ -45,7 +46,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -54,7 +55,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of ReferralAccountApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' ReferralAccountApi
@@ -64,7 +65,7 @@ public void InstanceTest()
         /// <summary>
         /// Test ReferralAccountsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ReferralAccountsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/ResellerAccountApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/ResellerAccountApiTests.cs
index 794367f..8297b37 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/ResellerAccountApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/ResellerAccountApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class ResellerAccountApiTests
     {
         private ResellerAccountApi instance;
@@ -37,7 +38,7 @@ public class ResellerAccountApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new ResellerAccountApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of ResellerAccountApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' ResellerAccountApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test ResellerAccountsByClientUserIdGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ResellerAccountsByClientUserIdGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void ResellerAccountsByClientUserIdGetTest()
         /// <summary>
         /// Test ResellerAccountsByClientUserIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ResellerAccountsByClientUserIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -88,7 +89,7 @@ public void ResellerAccountsByClientUserIdPutTest()
         /// <summary>
         /// Test ResellerAccountsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ResellerAccountsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -100,7 +101,7 @@ public void ResellerAccountsGetTest()
         /// <summary>
         /// Test ResellerAccountsPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ResellerAccountsPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/SMSApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/SMSApiTests.cs
index 7fa3841..69c9fb9 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/SMSApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/SMSApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class SMSApiTests
     {
         private SMSApi instance;
@@ -37,7 +38,7 @@ public class SMSApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new SMSApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of SMSApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' SMSApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test SmsCancelAllPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsCancelAllPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -75,7 +76,7 @@ public void SmsCancelAllPutTest()
         /// <summary>
         /// Test SmsCancelByMessageIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsCancelByMessageIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -86,7 +87,7 @@ public void SmsCancelByMessageIdPutTest()
         /// <summary>
         /// Test SmsHistoryExportGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsHistoryExportGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -97,7 +98,7 @@ public void SmsHistoryExportGetTest()
         /// <summary>
         /// Test SmsHistoryGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsHistoryGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -112,7 +113,7 @@ public void SmsHistoryGetTest()
         /// <summary>
         /// Test SmsInboundGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsInboundGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -125,7 +126,7 @@ public void SmsInboundGetTest()
         /// <summary>
         /// Test SmsInboundPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsInboundPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -136,7 +137,7 @@ public void SmsInboundPostTest()
         /// <summary>
         /// Test SmsInboundReadByMessageIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsInboundReadByMessageIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -147,7 +148,7 @@ public void SmsInboundReadByMessageIdPutTest()
         /// <summary>
         /// Test SmsInboundReadPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsInboundReadPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -158,7 +159,7 @@ public void SmsInboundReadPutTest()
         /// <summary>
         /// Test SmsPricePost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsPricePostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -169,7 +170,7 @@ public void SmsPricePostTest()
         /// <summary>
         /// Test SmsReceiptsByMessageIdGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsReceiptsByMessageIdGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -180,7 +181,7 @@ public void SmsReceiptsByMessageIdGetTest()
         /// <summary>
         /// Test SmsReceiptsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsReceiptsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -192,7 +193,7 @@ public void SmsReceiptsGetTest()
         /// <summary>
         /// Test SmsReceiptsPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsReceiptsPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -203,7 +204,7 @@ public void SmsReceiptsPostTest()
         /// <summary>
         /// Test SmsReceiptsReadPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsReceiptsReadPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -214,7 +215,7 @@ public void SmsReceiptsReadPutTest()
         /// <summary>
         /// Test SmsSendPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsSendPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -225,7 +226,7 @@ public void SmsSendPostTest()
         /// <summary>
         /// Test SmsTemplatesByTemplateIdDelete
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsTemplatesByTemplateIdDeleteTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -236,7 +237,7 @@ public void SmsTemplatesByTemplateIdDeleteTest()
         /// <summary>
         /// Test SmsTemplatesByTemplateIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsTemplatesByTemplateIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -248,7 +249,7 @@ public void SmsTemplatesByTemplateIdPutTest()
         /// <summary>
         /// Test SmsTemplatesGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsTemplatesGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -260,7 +261,7 @@ public void SmsTemplatesGetTest()
         /// <summary>
         /// Test SmsTemplatesPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsTemplatesPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/SMSDeliveryReceiptRulesApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/SMSDeliveryReceiptRulesApiTests.cs
index 439787c..b32b907 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/SMSDeliveryReceiptRulesApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/SMSDeliveryReceiptRulesApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class SMSDeliveryReceiptRulesApiTests
     {
         private SMSDeliveryReceiptRulesApi instance;
@@ -37,7 +38,7 @@ public class SMSDeliveryReceiptRulesApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new SMSDeliveryReceiptRulesApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of SMSDeliveryReceiptRulesApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' SMSDeliveryReceiptRulesApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test SmsDeliveryReceiptAutomationDelete
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsDeliveryReceiptAutomationDeleteTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void SmsDeliveryReceiptAutomationDeleteTest()
         /// <summary>
         /// Test SmsDeliveryReceiptAutomationGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsDeliveryReceiptAutomationGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -87,7 +88,7 @@ public void SmsDeliveryReceiptAutomationGetTest()
         /// <summary>
         /// Test SmsDeliveryReceiptAutomationPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsDeliveryReceiptAutomationPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -98,7 +99,7 @@ public void SmsDeliveryReceiptAutomationPostTest()
         /// <summary>
         /// Test SmsDeliveryReceiptAutomationPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsDeliveryReceiptAutomationPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -110,7 +111,7 @@ public void SmsDeliveryReceiptAutomationPutTest()
         /// <summary>
         /// Test SmsDeliveryReceiptAutomationsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsDeliveryReceiptAutomationsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/SearchApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/SearchApiTests.cs
index 8013ef6..740cea5 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/SearchApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/SearchApiTests.cs
@@ -14,10 +14,11 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -28,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class SearchApiTests
     {
         private SearchApi instance;
@@ -36,7 +37,7 @@ public class SearchApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new SearchApi();
@@ -45,7 +46,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -54,7 +55,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of SearchApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' SearchApi
@@ -64,7 +65,7 @@ public void InstanceTest()
         /// <summary>
         /// Test SearchContactsListsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SearchContactsListsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/SmsCampaignApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/SmsCampaignApiTests.cs
index 81cdbf2..53be889 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/SmsCampaignApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/SmsCampaignApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class SmsCampaignApiTests
     {
         private SmsCampaignApi instance;
@@ -37,7 +38,7 @@ public class SmsCampaignApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new SmsCampaignApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of SmsCampaignApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' SmsCampaignApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test SmsCampaignBySmsCampaignIdGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsCampaignBySmsCampaignIdGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void SmsCampaignBySmsCampaignIdGetTest()
         /// <summary>
         /// Test SmsCampaignsBySmsCampaignIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsCampaignsBySmsCampaignIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -88,7 +89,7 @@ public void SmsCampaignsBySmsCampaignIdPutTest()
         /// <summary>
         /// Test SmsCampaignsCancelBySmsCampaignIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsCampaignsCancelBySmsCampaignIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -99,7 +100,7 @@ public void SmsCampaignsCancelBySmsCampaignIdPutTest()
         /// <summary>
         /// Test SmsCampaignsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsCampaignsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -111,7 +112,7 @@ public void SmsCampaignsGetTest()
         /// <summary>
         /// Test SmsCampaignsPricePost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsCampaignsPricePostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -122,7 +123,7 @@ public void SmsCampaignsPricePostTest()
         /// <summary>
         /// Test SmsCampaignsSendPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsCampaignsSendPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/StatisticsApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/StatisticsApiTests.cs
index e66bdfc..8d37252 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/StatisticsApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/StatisticsApiTests.cs
@@ -14,10 +14,11 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -28,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class StatisticsApiTests
     {
         private StatisticsApi instance;
@@ -36,7 +37,7 @@ public class StatisticsApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new StatisticsApi();
@@ -45,7 +46,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -54,7 +55,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of StatisticsApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' StatisticsApi
@@ -64,7 +65,7 @@ public void InstanceTest()
         /// <summary>
         /// Test StatisticsSmsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void StatisticsSmsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -74,7 +75,7 @@ public void StatisticsSmsGetTest()
         /// <summary>
         /// Test StatisticsVoiceGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void StatisticsVoiceGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/SubaccountApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/SubaccountApiTests.cs
index ecfd338..cd6a719 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/SubaccountApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/SubaccountApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class SubaccountApiTests
     {
         private SubaccountApi instance;
@@ -37,7 +38,7 @@ public class SubaccountApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new SubaccountApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of SubaccountApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' SubaccountApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test SubaccountsBySubaccountIdDelete
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SubaccountsBySubaccountIdDeleteTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void SubaccountsBySubaccountIdDeleteTest()
         /// <summary>
         /// Test SubaccountsBySubaccountIdGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SubaccountsBySubaccountIdGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -87,7 +88,7 @@ public void SubaccountsBySubaccountIdGetTest()
         /// <summary>
         /// Test SubaccountsBySubaccountIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SubaccountsBySubaccountIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -99,7 +100,7 @@ public void SubaccountsBySubaccountIdPutTest()
         /// <summary>
         /// Test SubaccountsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SubaccountsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -111,7 +112,7 @@ public void SubaccountsGetTest()
         /// <summary>
         /// Test SubaccountsPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SubaccountsPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -122,7 +123,7 @@ public void SubaccountsPostTest()
         /// <summary>
         /// Test SubaccountsRegenApiKeyBySubaccountIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SubaccountsRegenApiKeyBySubaccountIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/TimezonesApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/TimezonesApiTests.cs
index 6de0ce1..76a8229 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/TimezonesApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/TimezonesApiTests.cs
@@ -14,10 +14,11 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -28,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class TimezonesApiTests
     {
         private TimezonesApi instance;
@@ -36,7 +37,7 @@ public class TimezonesApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new TimezonesApi();
@@ -45,7 +46,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -54,7 +55,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of TimezonesApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' TimezonesApi
@@ -64,7 +65,7 @@ public void InstanceTest()
         /// <summary>
         /// Test TimezonesGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void TimezonesGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/TransactionalEmailApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/TransactionalEmailApiTests.cs
index 4f0fd53..fc68598 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/TransactionalEmailApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/TransactionalEmailApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class TransactionalEmailApiTests
     {
         private TransactionalEmailApi instance;
@@ -37,7 +38,7 @@ public class TransactionalEmailApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new TransactionalEmailApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of TransactionalEmailApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' TransactionalEmailApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test EmailHistoryExportGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailHistoryExportGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -78,7 +79,7 @@ public void EmailHistoryExportGetTest()
         /// <summary>
         /// Test EmailHistoryGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailHistoryGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -92,7 +93,7 @@ public void EmailHistoryGetTest()
         /// <summary>
         /// Test EmailPricePost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailPricePostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -103,7 +104,7 @@ public void EmailPricePostTest()
         /// <summary>
         /// Test EmailSendPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailSendPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/TransferCreditApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/TransferCreditApiTests.cs
index fe2d139..d172eae 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/TransferCreditApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/TransferCreditApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class TransferCreditApiTests
     {
         private TransferCreditApi instance;
@@ -37,7 +38,7 @@ public class TransferCreditApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new TransferCreditApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of TransferCreditApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' TransferCreditApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test ResellerTransferCreditPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ResellerTransferCreditPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/UploadApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/UploadApiTests.cs
index b473523..2f2aef2 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/UploadApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/UploadApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class UploadApiTests
     {
         private UploadApi instance;
@@ -37,7 +38,7 @@ public class UploadApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new UploadApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of UploadApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' UploadApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test UploadsPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UploadsPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/UserEmailTemplatesApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/UserEmailTemplatesApiTests.cs
index 82e95cf..948b347 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/UserEmailTemplatesApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/UserEmailTemplatesApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class UserEmailTemplatesApiTests
     {
         private UserEmailTemplatesApi instance;
@@ -37,7 +38,7 @@ public class UserEmailTemplatesApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new UserEmailTemplatesApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of UserEmailTemplatesApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' UserEmailTemplatesApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test EmailTemplateDelete
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailTemplateDeleteTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void EmailTemplateDeleteTest()
         /// <summary>
         /// Test EmailTemplateGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailTemplateGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -87,7 +88,7 @@ public void EmailTemplateGetTest()
         /// <summary>
         /// Test EmailTemplatePost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailTemplatePostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -98,7 +99,7 @@ public void EmailTemplatePostTest()
         /// <summary>
         /// Test EmailTemplatePut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailTemplatePutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -110,7 +111,7 @@ public void EmailTemplatePutTest()
         /// <summary>
         /// Test EmailTemplatesGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailTemplatesGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/VoiceApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/VoiceApiTests.cs
index a13b449..56c66a3 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/VoiceApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/VoiceApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class VoiceApiTests
     {
         private VoiceApi instance;
@@ -37,7 +38,7 @@ public class VoiceApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new VoiceApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of VoiceApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' VoiceApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test VoiceCancelAllPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceCancelAllPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -75,7 +76,7 @@ public void VoiceCancelAllPutTest()
         /// <summary>
         /// Test VoiceCancelByMessageIdPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceCancelByMessageIdPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -86,7 +87,7 @@ public void VoiceCancelByMessageIdPutTest()
         /// <summary>
         /// Test VoiceHistoryExportGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceHistoryExportGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -97,7 +98,7 @@ public void VoiceHistoryExportGetTest()
         /// <summary>
         /// Test VoiceHistoryGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceHistoryGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -111,7 +112,7 @@ public void VoiceHistoryGetTest()
         /// <summary>
         /// Test VoiceLangGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceLangGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -121,7 +122,7 @@ public void VoiceLangGetTest()
         /// <summary>
         /// Test VoicePricePost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoicePricePostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -132,7 +133,7 @@ public void VoicePricePostTest()
         /// <summary>
         /// Test VoiceReceiptsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceReceiptsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -144,7 +145,7 @@ public void VoiceReceiptsGetTest()
         /// <summary>
         /// Test VoiceReceiptsPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceReceiptsPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -155,7 +156,7 @@ public void VoiceReceiptsPostTest()
         /// <summary>
         /// Test VoiceReceiptsReadPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceReceiptsReadPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -166,7 +167,7 @@ public void VoiceReceiptsReadPutTest()
         /// <summary>
         /// Test VoiceSendPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceSendPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Api/VoiceDeliveryReceiptRulesApiTests.cs b/src/IO.ClickSend.Test/ClickSend.Api/VoiceDeliveryReceiptRulesApiTests.cs
index 3ba20b9..3676267 100644
--- a/src/IO.ClickSend.Test/ClickSend.Api/VoiceDeliveryReceiptRulesApiTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Api/VoiceDeliveryReceiptRulesApiTests.cs
@@ -14,11 +14,12 @@
 using System.Linq;
 using System.Reflection;
 using RestSharp;
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using IO.ClickSend.Client;
 using IO.ClickSend.ClickSend.Api;
 using IO.ClickSend.ClickSend.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the API endpoint.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class VoiceDeliveryReceiptRulesApiTests
     {
         private VoiceDeliveryReceiptRulesApi instance;
@@ -37,7 +38,7 @@ public class VoiceDeliveryReceiptRulesApiTests
         /// <summary>
         /// Setup before each unit test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             instance = new VoiceDeliveryReceiptRulesApi();
@@ -46,7 +47,7 @@ public void Init()
         /// <summary>
         /// Clean up after each unit test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -55,7 +56,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of VoiceDeliveryReceiptRulesApi
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InstanceTest()
         {
             // TODO uncomment below to test 'IsInstanceOfType' VoiceDeliveryReceiptRulesApi
@@ -65,7 +66,7 @@ public void InstanceTest()
         /// <summary>
         /// Test VoiceDeliveryReceiptAutomationDelete
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceDeliveryReceiptAutomationDeleteTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -76,7 +77,7 @@ public void VoiceDeliveryReceiptAutomationDeleteTest()
         /// <summary>
         /// Test VoiceDeliveryReceiptAutomationGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceDeliveryReceiptAutomationGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -87,7 +88,7 @@ public void VoiceDeliveryReceiptAutomationGetTest()
         /// <summary>
         /// Test VoiceDeliveryReceiptAutomationPost
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceDeliveryReceiptAutomationPostTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -98,7 +99,7 @@ public void VoiceDeliveryReceiptAutomationPostTest()
         /// <summary>
         /// Test VoiceDeliveryReceiptAutomationPut
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceDeliveryReceiptAutomationPutTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
@@ -110,7 +111,7 @@ public void VoiceDeliveryReceiptAutomationPutTest()
         /// <summary>
         /// Test VoiceDeliveryReceiptAutomationsGet
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceDeliveryReceiptAutomationsGetTest()
         {
             // TODO uncomment below to test the method and replace null with proper value
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/AccountForgotPasswordVerifyTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/AccountForgotPasswordVerifyTests.cs
index 2d365f8..9af14c6 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/AccountForgotPasswordVerifyTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/AccountForgotPasswordVerifyTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class AccountForgotPasswordVerifyTests
     {
         // TODO uncomment below to declare an instance variable for AccountForgotPasswordVerify
@@ -38,7 +39,7 @@ public class AccountForgotPasswordVerifyTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of AccountForgotPasswordVerify
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of AccountForgotPasswordVerify
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccountForgotPasswordVerifyInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" AccountForgotPasswordVerify
@@ -68,7 +69,7 @@ public void AccountForgotPasswordVerifyInstanceTest()
         /// <summary>
         /// Test the property 'SubaccountId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SubaccountIdTest()
         {
             // TODO unit test for the property 'SubaccountId'
@@ -76,7 +77,7 @@ public void SubaccountIdTest()
         /// <summary>
         /// Test the property 'ActivationToken'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ActivationTokenTest()
         {
             // TODO unit test for the property 'ActivationToken'
@@ -84,7 +85,7 @@ public void ActivationTokenTest()
         /// <summary>
         /// Test the property 'Password'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PasswordTest()
         {
             // TODO unit test for the property 'Password'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/AccountTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/AccountTests.cs
index 5a2791b..f2decb1 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/AccountTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/AccountTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class AccountTests
     {
         // TODO uncomment below to declare an instance variable for Account
@@ -38,7 +39,7 @@ public class AccountTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of Account
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of Account
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccountInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" Account
@@ -68,7 +69,7 @@ public void AccountInstanceTest()
         /// <summary>
         /// Test the property 'Username'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UsernameTest()
         {
             // TODO unit test for the property 'Username'
@@ -76,7 +77,7 @@ public void UsernameTest()
         /// <summary>
         /// Test the property 'Password'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PasswordTest()
         {
             // TODO unit test for the property 'Password'
@@ -84,7 +85,7 @@ public void PasswordTest()
         /// <summary>
         /// Test the property 'UserPhone'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UserPhoneTest()
         {
             // TODO unit test for the property 'UserPhone'
@@ -92,7 +93,7 @@ public void UserPhoneTest()
         /// <summary>
         /// Test the property 'UserEmail'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UserEmailTest()
         {
             // TODO unit test for the property 'UserEmail'
@@ -100,7 +101,7 @@ public void UserEmailTest()
         /// <summary>
         /// Test the property 'UserFirstName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UserFirstNameTest()
         {
             // TODO unit test for the property 'UserFirstName'
@@ -108,7 +109,7 @@ public void UserFirstNameTest()
         /// <summary>
         /// Test the property 'UserLastName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UserLastNameTest()
         {
             // TODO unit test for the property 'UserLastName'
@@ -116,7 +117,7 @@ public void UserLastNameTest()
         /// <summary>
         /// Test the property 'AccountName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccountNameTest()
         {
             // TODO unit test for the property 'AccountName'
@@ -124,7 +125,7 @@ public void AccountNameTest()
         /// <summary>
         /// Test the property 'Country'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CountryTest()
         {
             // TODO unit test for the property 'Country'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/AccountVerifyTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/AccountVerifyTests.cs
index 1a8c606..19835ff 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/AccountVerifyTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/AccountVerifyTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class AccountVerifyTests
     {
         // TODO uncomment below to declare an instance variable for AccountVerify
@@ -38,7 +39,7 @@ public class AccountVerifyTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of AccountVerify
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of AccountVerify
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccountVerifyInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" AccountVerify
@@ -68,7 +69,7 @@ public void AccountVerifyInstanceTest()
         /// <summary>
         /// Test the property 'Country'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CountryTest()
         {
             // TODO unit test for the property 'Country'
@@ -76,7 +77,7 @@ public void CountryTest()
         /// <summary>
         /// Test the property 'UserPhone'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UserPhoneTest()
         {
             // TODO unit test for the property 'UserPhone'
@@ -84,7 +85,7 @@ public void UserPhoneTest()
         /// <summary>
         /// Test the property 'Type'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void TypeTest()
         {
             // TODO unit test for the property 'Type'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/AddressTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/AddressTests.cs
index 74a99ec..1646e43 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/AddressTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/AddressTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class AddressTests
     {
         // TODO uncomment below to declare an instance variable for Address
@@ -38,7 +39,7 @@ public class AddressTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of Address
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of Address
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" Address
@@ -68,7 +69,7 @@ public void AddressInstanceTest()
         /// <summary>
         /// Test the property 'AddressName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressNameTest()
         {
             // TODO unit test for the property 'AddressName'
@@ -76,7 +77,7 @@ public void AddressNameTest()
         /// <summary>
         /// Test the property 'AddressLine1'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressLine1Test()
         {
             // TODO unit test for the property 'AddressLine1'
@@ -84,7 +85,7 @@ public void AddressLine1Test()
         /// <summary>
         /// Test the property 'AddressCity'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressCityTest()
         {
             // TODO unit test for the property 'AddressCity'
@@ -92,7 +93,7 @@ public void AddressCityTest()
         /// <summary>
         /// Test the property 'AddressPostalCode'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressPostalCodeTest()
         {
             // TODO unit test for the property 'AddressPostalCode'
@@ -100,7 +101,7 @@ public void AddressPostalCodeTest()
         /// <summary>
         /// Test the property 'AddressCountry'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressCountryTest()
         {
             // TODO unit test for the property 'AddressCountry'
@@ -108,7 +109,7 @@ public void AddressCountryTest()
         /// <summary>
         /// Test the property 'AddressLine2'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressLine2Test()
         {
             // TODO unit test for the property 'AddressLine2'
@@ -116,7 +117,7 @@ public void AddressLine2Test()
         /// <summary>
         /// Test the property 'AddressState'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressStateTest()
         {
             // TODO unit test for the property 'AddressState'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/AttachmentTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/AttachmentTests.cs
index e79295d..69dd693 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/AttachmentTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/AttachmentTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class AttachmentTests
     {
         // TODO uncomment below to declare an instance variable for Attachment
@@ -38,7 +39,7 @@ public class AttachmentTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of Attachment
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of Attachment
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AttachmentInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" Attachment
@@ -68,7 +69,7 @@ public void AttachmentInstanceTest()
         /// <summary>
         /// Test the property 'Content'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ContentTest()
         {
             // TODO unit test for the property 'Content'
@@ -76,7 +77,7 @@ public void ContentTest()
         /// <summary>
         /// Test the property 'Type'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void TypeTest()
         {
             // TODO unit test for the property 'Type'
@@ -84,7 +85,7 @@ public void TypeTest()
         /// <summary>
         /// Test the property 'Filename'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FilenameTest()
         {
             // TODO unit test for the property 'Filename'
@@ -92,7 +93,7 @@ public void FilenameTest()
         /// <summary>
         /// Test the property 'Disposition'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void DispositionTest()
         {
             // TODO unit test for the property 'Disposition'
@@ -100,7 +101,7 @@ public void DispositionTest()
         /// <summary>
         /// Test the property 'ContentId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ContentIdTest()
         {
             // TODO unit test for the property 'ContentId'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/ContactListImportTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/ContactListImportTests.cs
index c220d46..f1273d5 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/ContactListImportTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/ContactListImportTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class ContactListImportTests
     {
         // TODO uncomment below to declare an instance variable for ContactListImport
@@ -38,7 +39,7 @@ public class ContactListImportTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of ContactListImport
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of ContactListImport
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ContactListImportInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" ContactListImport
@@ -68,7 +69,7 @@ public void ContactListImportInstanceTest()
         /// <summary>
         /// Test the property 'FileUrl'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FileUrlTest()
         {
             // TODO unit test for the property 'FileUrl'
@@ -76,7 +77,7 @@ public void FileUrlTest()
         /// <summary>
         /// Test the property 'FieldOrder'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FieldOrderTest()
         {
             // TODO unit test for the property 'FieldOrder'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/ContactListTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/ContactListTests.cs
index 28e4824..41826d8 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/ContactListTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/ContactListTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class ContactListTests
     {
         // TODO uncomment below to declare an instance variable for ContactList
@@ -38,7 +39,7 @@ public class ContactListTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of ContactList
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of ContactList
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ContactListInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" ContactList
@@ -68,7 +69,7 @@ public void ContactListInstanceTest()
         /// <summary>
         /// Test the property 'ListName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListNameTest()
         {
             // TODO unit test for the property 'ListName'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/ContactTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/ContactTests.cs
index d10edbb..03fd567 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/ContactTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/ContactTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class ContactTests
     {
         // TODO uncomment below to declare an instance variable for Contact
@@ -38,7 +39,7 @@ public class ContactTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of Contact
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of Contact
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ContactInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" Contact
@@ -68,7 +69,7 @@ public void ContactInstanceTest()
         /// <summary>
         /// Test the property 'PhoneNumber'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PhoneNumberTest()
         {
             // TODO unit test for the property 'PhoneNumber'
@@ -76,7 +77,7 @@ public void PhoneNumberTest()
         /// <summary>
         /// Test the property 'Custom1'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void Custom1Test()
         {
             // TODO unit test for the property 'Custom1'
@@ -84,7 +85,7 @@ public void Custom1Test()
         /// <summary>
         /// Test the property 'Email'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailTest()
         {
             // TODO unit test for the property 'Email'
@@ -92,7 +93,7 @@ public void EmailTest()
         /// <summary>
         /// Test the property 'FaxNumber'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxNumberTest()
         {
             // TODO unit test for the property 'FaxNumber'
@@ -100,7 +101,7 @@ public void FaxNumberTest()
         /// <summary>
         /// Test the property 'FirstName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FirstNameTest()
         {
             // TODO unit test for the property 'FirstName'
@@ -108,7 +109,7 @@ public void FirstNameTest()
         /// <summary>
         /// Test the property 'AddressLine1'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressLine1Test()
         {
             // TODO unit test for the property 'AddressLine1'
@@ -116,7 +117,7 @@ public void AddressLine1Test()
         /// <summary>
         /// Test the property 'AddressLine2'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressLine2Test()
         {
             // TODO unit test for the property 'AddressLine2'
@@ -124,7 +125,7 @@ public void AddressLine2Test()
         /// <summary>
         /// Test the property 'AddressCity'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressCityTest()
         {
             // TODO unit test for the property 'AddressCity'
@@ -132,7 +133,7 @@ public void AddressCityTest()
         /// <summary>
         /// Test the property 'AddressState'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressStateTest()
         {
             // TODO unit test for the property 'AddressState'
@@ -140,7 +141,7 @@ public void AddressStateTest()
         /// <summary>
         /// Test the property 'AddressPostalCode'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressPostalCodeTest()
         {
             // TODO unit test for the property 'AddressPostalCode'
@@ -148,7 +149,7 @@ public void AddressPostalCodeTest()
         /// <summary>
         /// Test the property 'AddressCountry'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressCountryTest()
         {
             // TODO unit test for the property 'AddressCountry'
@@ -156,7 +157,7 @@ public void AddressCountryTest()
         /// <summary>
         /// Test the property 'OrganizationName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void OrganizationNameTest()
         {
             // TODO unit test for the property 'OrganizationName'
@@ -164,7 +165,7 @@ public void OrganizationNameTest()
         /// <summary>
         /// Test the property 'Custom2'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void Custom2Test()
         {
             // TODO unit test for the property 'Custom2'
@@ -172,7 +173,7 @@ public void Custom2Test()
         /// <summary>
         /// Test the property 'Custom3'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void Custom3Test()
         {
             // TODO unit test for the property 'Custom3'
@@ -180,7 +181,7 @@ public void Custom3Test()
         /// <summary>
         /// Test the property 'Custom4'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void Custom4Test()
         {
             // TODO unit test for the property 'Custom4'
@@ -188,7 +189,7 @@ public void Custom4Test()
         /// <summary>
         /// Test the property 'LastName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void LastNameTest()
         {
             // TODO unit test for the property 'LastName'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/CountryListIdsTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/CountryListIdsTests.cs
index 2ca837a..041833b 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/CountryListIdsTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/CountryListIdsTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class CountryListIdsTests
     {
         // TODO uncomment below to declare an instance variable for CountryListIds
@@ -38,7 +39,7 @@ public class CountryListIdsTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of CountryListIds
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of CountryListIds
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CountryListIdsInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" CountryListIds
@@ -68,7 +69,7 @@ public void CountryListIdsInstanceTest()
         /// <summary>
         /// Test the property '_CountryListIds'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void _CountryListIdsTest()
         {
             // TODO unit test for the property '_CountryListIds'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/CreditCardTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/CreditCardTests.cs
index 7310dfb..3fbee85 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/CreditCardTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/CreditCardTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class CreditCardTests
     {
         // TODO uncomment below to declare an instance variable for CreditCard
@@ -38,7 +39,7 @@ public class CreditCardTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of CreditCard
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of CreditCard
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CreditCardInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" CreditCard
@@ -68,7 +69,7 @@ public void CreditCardInstanceTest()
         /// <summary>
         /// Test the property 'Number'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void NumberTest()
         {
             // TODO unit test for the property 'Number'
@@ -76,7 +77,7 @@ public void NumberTest()
         /// <summary>
         /// Test the property 'ExpiryMonth'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ExpiryMonthTest()
         {
             // TODO unit test for the property 'ExpiryMonth'
@@ -84,7 +85,7 @@ public void ExpiryMonthTest()
         /// <summary>
         /// Test the property 'ExpiryYear'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ExpiryYearTest()
         {
             // TODO unit test for the property 'ExpiryYear'
@@ -92,7 +93,7 @@ public void ExpiryYearTest()
         /// <summary>
         /// Test the property 'Cvc'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CvcTest()
         {
             // TODO unit test for the property 'Cvc'
@@ -100,7 +101,7 @@ public void CvcTest()
         /// <summary>
         /// Test the property 'Name'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void NameTest()
         {
             // TODO unit test for the property 'Name'
@@ -108,7 +109,7 @@ public void NameTest()
         /// <summary>
         /// Test the property 'BankName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void BankNameTest()
         {
             // TODO unit test for the property 'BankName'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/DateBeforeTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/DateBeforeTests.cs
index 627d4b1..a851965 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/DateBeforeTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/DateBeforeTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class DateBeforeTests
     {
         // TODO uncomment below to declare an instance variable for DateBefore
@@ -38,7 +39,7 @@ public class DateBeforeTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of DateBefore
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of DateBefore
         /// </summary>
-        [Test]
+        [TestMethod]
         public void DateBeforeInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" DateBefore
@@ -68,7 +69,7 @@ public void DateBeforeInstanceTest()
         /// <summary>
         /// Test the property '_DateBefore'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void _DateBeforeTest()
         {
             // TODO unit test for the property '_DateBefore'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/DeliveryIssueTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/DeliveryIssueTests.cs
index 020c3e8..f925efb 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/DeliveryIssueTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/DeliveryIssueTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class DeliveryIssueTests
     {
         // TODO uncomment below to declare an instance variable for DeliveryIssue
@@ -38,7 +39,7 @@ public class DeliveryIssueTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of DeliveryIssue
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of DeliveryIssue
         /// </summary>
-        [Test]
+        [TestMethod]
         public void DeliveryIssueInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" DeliveryIssue
@@ -68,7 +69,7 @@ public void DeliveryIssueInstanceTest()
         /// <summary>
         /// Test the property 'MessageId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MessageIdTest()
         {
             // TODO unit test for the property 'MessageId'
@@ -76,7 +77,7 @@ public void MessageIdTest()
         /// <summary>
         /// Test the property 'Type'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void TypeTest()
         {
             // TODO unit test for the property 'Type'
@@ -84,7 +85,7 @@ public void TypeTest()
         /// <summary>
         /// Test the property 'Description'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void DescriptionTest()
         {
             // TODO unit test for the property 'Description'
@@ -92,7 +93,7 @@ public void DescriptionTest()
         /// <summary>
         /// Test the property 'ClientComments'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ClientCommentsTest()
         {
             // TODO unit test for the property 'ClientComments'
@@ -100,7 +101,7 @@ public void ClientCommentsTest()
         /// <summary>
         /// Test the property 'EmailAddress'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailAddressTest()
         {
             // TODO unit test for the property 'EmailAddress'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/DeliveryReceiptRuleTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/DeliveryReceiptRuleTests.cs
index 9c4526a..b48b0b3 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/DeliveryReceiptRuleTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/DeliveryReceiptRuleTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class DeliveryReceiptRuleTests
     {
         // TODO uncomment below to declare an instance variable for DeliveryReceiptRule
@@ -38,7 +39,7 @@ public class DeliveryReceiptRuleTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of DeliveryReceiptRule
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of DeliveryReceiptRule
         /// </summary>
-        [Test]
+        [TestMethod]
         public void DeliveryReceiptRuleInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" DeliveryReceiptRule
@@ -68,7 +69,7 @@ public void DeliveryReceiptRuleInstanceTest()
         /// <summary>
         /// Test the property 'RuleName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void RuleNameTest()
         {
             // TODO unit test for the property 'RuleName'
@@ -76,7 +77,7 @@ public void RuleNameTest()
         /// <summary>
         /// Test the property 'MatchType'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MatchTypeTest()
         {
             // TODO unit test for the property 'MatchType'
@@ -84,7 +85,7 @@ public void MatchTypeTest()
         /// <summary>
         /// Test the property 'Action'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ActionTest()
         {
             // TODO unit test for the property 'Action'
@@ -92,7 +93,7 @@ public void ActionTest()
         /// <summary>
         /// Test the property 'ActionAddress'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ActionAddressTest()
         {
             // TODO unit test for the property 'ActionAddress'
@@ -100,7 +101,7 @@ public void ActionAddressTest()
         /// <summary>
         /// Test the property 'Enabled'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EnabledTest()
         {
             // TODO unit test for the property 'Enabled'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/EmailAddressTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/EmailAddressTests.cs
index 7cd3402..3f3ff06 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/EmailAddressTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/EmailAddressTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class EmailAddressTests
     {
         // TODO uncomment below to declare an instance variable for EmailAddress
@@ -38,7 +39,7 @@ public class EmailAddressTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of EmailAddress
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of EmailAddress
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailAddressInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" EmailAddress
@@ -68,7 +69,7 @@ public void EmailAddressInstanceTest()
         /// <summary>
         /// Test the property '_EmailAddress'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void _EmailAddressTest()
         {
             // TODO unit test for the property '_EmailAddress'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/EmailCampaignTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/EmailCampaignTests.cs
index baf442e..4185012 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/EmailCampaignTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/EmailCampaignTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class EmailCampaignTests
     {
         // TODO uncomment below to declare an instance variable for EmailCampaign
@@ -38,7 +39,7 @@ public class EmailCampaignTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of EmailCampaign
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of EmailCampaign
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailCampaignInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" EmailCampaign
@@ -68,7 +69,7 @@ public void EmailCampaignInstanceTest()
         /// <summary>
         /// Test the property 'Name'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void NameTest()
         {
             // TODO unit test for the property 'Name'
@@ -76,7 +77,7 @@ public void NameTest()
         /// <summary>
         /// Test the property 'Subject'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SubjectTest()
         {
             // TODO unit test for the property 'Subject'
@@ -84,7 +85,7 @@ public void SubjectTest()
         /// <summary>
         /// Test the property 'Body'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void BodyTest()
         {
             // TODO unit test for the property 'Body'
@@ -92,7 +93,7 @@ public void BodyTest()
         /// <summary>
         /// Test the property 'FromEmailAddressId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FromEmailAddressIdTest()
         {
             // TODO unit test for the property 'FromEmailAddressId'
@@ -100,7 +101,7 @@ public void FromEmailAddressIdTest()
         /// <summary>
         /// Test the property 'FromName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FromNameTest()
         {
             // TODO unit test for the property 'FromName'
@@ -108,7 +109,7 @@ public void FromNameTest()
         /// <summary>
         /// Test the property 'TemplateId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void TemplateIdTest()
         {
             // TODO unit test for the property 'TemplateId'
@@ -116,7 +117,7 @@ public void TemplateIdTest()
         /// <summary>
         /// Test the property 'ListId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListIdTest()
         {
             // TODO unit test for the property 'ListId'
@@ -124,7 +125,7 @@ public void ListIdTest()
         /// <summary>
         /// Test the property 'Schedule'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ScheduleTest()
         {
             // TODO unit test for the property 'Schedule'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/EmailFromTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/EmailFromTests.cs
index 1597f8d..4d7ef72 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/EmailFromTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/EmailFromTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class EmailFromTests
     {
         // TODO uncomment below to declare an instance variable for EmailFrom
@@ -38,7 +39,7 @@ public class EmailFromTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of EmailFrom
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of EmailFrom
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailFromInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" EmailFrom
@@ -68,7 +69,7 @@ public void EmailFromInstanceTest()
         /// <summary>
         /// Test the property 'EmailAddressId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailAddressIdTest()
         {
             // TODO unit test for the property 'EmailAddressId'
@@ -76,7 +77,7 @@ public void EmailAddressIdTest()
         /// <summary>
         /// Test the property 'Name'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void NameTest()
         {
             // TODO unit test for the property 'Name'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/EmailRecipientTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/EmailRecipientTests.cs
index 4a2cecc..ca71217 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/EmailRecipientTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/EmailRecipientTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class EmailRecipientTests
     {
         // TODO uncomment below to declare an instance variable for EmailRecipient
@@ -38,7 +39,7 @@ public class EmailRecipientTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of EmailRecipient
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of EmailRecipient
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailRecipientInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" EmailRecipient
@@ -68,7 +69,7 @@ public void EmailRecipientInstanceTest()
         /// <summary>
         /// Test the property 'Email'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailTest()
         {
             // TODO unit test for the property 'Email'
@@ -76,7 +77,7 @@ public void EmailTest()
         /// <summary>
         /// Test the property 'Name'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void NameTest()
         {
             // TODO unit test for the property 'Name'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/EmailSMSAddressTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/EmailSMSAddressTests.cs
index dfeb5bc..b2aa929 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/EmailSMSAddressTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/EmailSMSAddressTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class EmailSMSAddressTests
     {
         // TODO uncomment below to declare an instance variable for EmailSMSAddress
@@ -38,7 +39,7 @@ public class EmailSMSAddressTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of EmailSMSAddress
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of EmailSMSAddress
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailSMSAddressInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" EmailSMSAddress
@@ -68,7 +69,7 @@ public void EmailSMSAddressInstanceTest()
         /// <summary>
         /// Test the property 'EmailAddress'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailAddressTest()
         {
             // TODO unit test for the property 'EmailAddress'
@@ -76,7 +77,7 @@ public void EmailAddressTest()
         /// <summary>
         /// Test the property 'From'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FromTest()
         {
             // TODO unit test for the property 'From'
@@ -84,7 +85,7 @@ public void FromTest()
         /// <summary>
         /// Test the property 'SubaccountId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SubaccountIdTest()
         {
             // TODO unit test for the property 'SubaccountId'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/EmailTemplateNewTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/EmailTemplateNewTests.cs
index ec85ad5..3502660 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/EmailTemplateNewTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/EmailTemplateNewTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class EmailTemplateNewTests
     {
         // TODO uncomment below to declare an instance variable for EmailTemplateNew
@@ -38,7 +39,7 @@ public class EmailTemplateNewTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of EmailTemplateNew
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of EmailTemplateNew
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailTemplateNewInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" EmailTemplateNew
@@ -68,7 +69,7 @@ public void EmailTemplateNewInstanceTest()
         /// <summary>
         /// Test the property 'TemplateName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void TemplateNameTest()
         {
             // TODO unit test for the property 'TemplateName'
@@ -76,7 +77,7 @@ public void TemplateNameTest()
         /// <summary>
         /// Test the property 'TemplateIdMaster'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void TemplateIdMasterTest()
         {
             // TODO unit test for the property 'TemplateIdMaster'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/EmailTemplateUpdateTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/EmailTemplateUpdateTests.cs
index 3c535d5..6e03d02 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/EmailTemplateUpdateTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/EmailTemplateUpdateTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class EmailTemplateUpdateTests
     {
         // TODO uncomment below to declare an instance variable for EmailTemplateUpdate
@@ -38,7 +39,7 @@ public class EmailTemplateUpdateTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of EmailTemplateUpdate
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of EmailTemplateUpdate
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailTemplateUpdateInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" EmailTemplateUpdate
@@ -68,7 +69,7 @@ public void EmailTemplateUpdateInstanceTest()
         /// <summary>
         /// Test the property 'TemplateName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void TemplateNameTest()
         {
             // TODO unit test for the property 'TemplateName'
@@ -76,7 +77,7 @@ public void TemplateNameTest()
         /// <summary>
         /// Test the property 'Body'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void BodyTest()
         {
             // TODO unit test for the property 'Body'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/EmailTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/EmailTests.cs
index a475a1e..dda8414 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/EmailTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/EmailTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class EmailTests
     {
         // TODO uncomment below to declare an instance variable for Email
@@ -38,7 +39,7 @@ public class EmailTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of Email
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of Email
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" Email
@@ -68,7 +69,7 @@ public void EmailInstanceTest()
         /// <summary>
         /// Test the property 'To'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ToTest()
         {
             // TODO unit test for the property 'To'
@@ -76,7 +77,7 @@ public void ToTest()
         /// <summary>
         /// Test the property 'Cc'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CcTest()
         {
             // TODO unit test for the property 'Cc'
@@ -84,7 +85,7 @@ public void CcTest()
         /// <summary>
         /// Test the property 'Bcc'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void BccTest()
         {
             // TODO unit test for the property 'Bcc'
@@ -92,7 +93,7 @@ public void BccTest()
         /// <summary>
         /// Test the property 'From'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FromTest()
         {
             // TODO unit test for the property 'From'
@@ -100,7 +101,7 @@ public void FromTest()
         /// <summary>
         /// Test the property 'Subject'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SubjectTest()
         {
             // TODO unit test for the property 'Subject'
@@ -108,7 +109,7 @@ public void SubjectTest()
         /// <summary>
         /// Test the property 'Body'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void BodyTest()
         {
             // TODO unit test for the property 'Body'
@@ -116,7 +117,7 @@ public void BodyTest()
         /// <summary>
         /// Test the property 'Attachments'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AttachmentsTest()
         {
             // TODO unit test for the property 'Attachments'
@@ -124,7 +125,7 @@ public void AttachmentsTest()
         /// <summary>
         /// Test the property 'Schedule'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ScheduleTest()
         {
             // TODO unit test for the property 'Schedule'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/FaxMessageCollectionTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/FaxMessageCollectionTests.cs
index 18c902a..c45b0c3 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/FaxMessageCollectionTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/FaxMessageCollectionTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class FaxMessageCollectionTests
     {
         // TODO uncomment below to declare an instance variable for FaxMessageCollection
@@ -38,7 +39,7 @@ public class FaxMessageCollectionTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of FaxMessageCollection
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of FaxMessageCollection
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxMessageCollectionInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" FaxMessageCollection
@@ -68,7 +69,7 @@ public void FaxMessageCollectionInstanceTest()
         /// <summary>
         /// Test the property 'Messages'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MessagesTest()
         {
             // TODO unit test for the property 'Messages'
@@ -76,7 +77,7 @@ public void MessagesTest()
         /// <summary>
         /// Test the property 'FileUrl'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FileUrlTest()
         {
             // TODO unit test for the property 'FileUrl'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/FaxMessageTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/FaxMessageTests.cs
index e6b4e1f..da66e81 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/FaxMessageTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/FaxMessageTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class FaxMessageTests
     {
         // TODO uncomment below to declare an instance variable for FaxMessage
@@ -38,7 +39,7 @@ public class FaxMessageTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of FaxMessage
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of FaxMessage
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxMessageInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" FaxMessage
@@ -68,7 +69,7 @@ public void FaxMessageInstanceTest()
         /// <summary>
         /// Test the property 'Source'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SourceTest()
         {
             // TODO unit test for the property 'Source'
@@ -76,7 +77,7 @@ public void SourceTest()
         /// <summary>
         /// Test the property 'To'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ToTest()
         {
             // TODO unit test for the property 'To'
@@ -84,7 +85,7 @@ public void ToTest()
         /// <summary>
         /// Test the property 'ListId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListIdTest()
         {
             // TODO unit test for the property 'ListId'
@@ -92,7 +93,7 @@ public void ListIdTest()
         /// <summary>
         /// Test the property 'From'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FromTest()
         {
             // TODO unit test for the property 'From'
@@ -100,7 +101,7 @@ public void FromTest()
         /// <summary>
         /// Test the property 'Schedule'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ScheduleTest()
         {
             // TODO unit test for the property 'Schedule'
@@ -108,7 +109,7 @@ public void ScheduleTest()
         /// <summary>
         /// Test the property 'CustomString'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CustomStringTest()
         {
             // TODO unit test for the property 'CustomString'
@@ -116,7 +117,7 @@ public void CustomStringTest()
         /// <summary>
         /// Test the property 'Country'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CountryTest()
         {
             // TODO unit test for the property 'Country'
@@ -124,7 +125,7 @@ public void CountryTest()
         /// <summary>
         /// Test the property 'FromEmail'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FromEmailTest()
         {
             // TODO unit test for the property 'FromEmail'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/FieldsFieldsTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/FieldsFieldsTests.cs
index b63ff9a..25c2888 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/FieldsFieldsTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/FieldsFieldsTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class FieldsFieldsTests
     {
         // TODO uncomment below to declare an instance variable for FieldsFields
@@ -38,7 +39,7 @@ public class FieldsFieldsTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of FieldsFields
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of FieldsFields
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FieldsFieldsInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" FieldsFields
@@ -68,7 +69,7 @@ public void FieldsFieldsInstanceTest()
         /// <summary>
         /// Test the property 'PhoneNumber'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PhoneNumberTest()
         {
             // TODO unit test for the property 'PhoneNumber'
@@ -76,7 +77,7 @@ public void PhoneNumberTest()
         /// <summary>
         /// Test the property 'Custom1'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void Custom1Test()
         {
             // TODO unit test for the property 'Custom1'
@@ -84,7 +85,7 @@ public void Custom1Test()
         /// <summary>
         /// Test the property 'Email'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailTest()
         {
             // TODO unit test for the property 'Email'
@@ -92,7 +93,7 @@ public void EmailTest()
         /// <summary>
         /// Test the property 'FaxNumber'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FaxNumberTest()
         {
             // TODO unit test for the property 'FaxNumber'
@@ -100,7 +101,7 @@ public void FaxNumberTest()
         /// <summary>
         /// Test the property 'FirstName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FirstNameTest()
         {
             // TODO unit test for the property 'FirstName'
@@ -108,7 +109,7 @@ public void FirstNameTest()
         /// <summary>
         /// Test the property 'AddressLine1'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressLine1Test()
         {
             // TODO unit test for the property 'AddressLine1'
@@ -116,7 +117,7 @@ public void AddressLine1Test()
         /// <summary>
         /// Test the property 'AddressLine2'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressLine2Test()
         {
             // TODO unit test for the property 'AddressLine2'
@@ -124,7 +125,7 @@ public void AddressLine2Test()
         /// <summary>
         /// Test the property 'AddressCity'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressCityTest()
         {
             // TODO unit test for the property 'AddressCity'
@@ -132,7 +133,7 @@ public void AddressCityTest()
         /// <summary>
         /// Test the property 'AddressState'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressStateTest()
         {
             // TODO unit test for the property 'AddressState'
@@ -140,7 +141,7 @@ public void AddressStateTest()
         /// <summary>
         /// Test the property 'AddressPostalCode'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressPostalCodeTest()
         {
             // TODO unit test for the property 'AddressPostalCode'
@@ -148,7 +149,7 @@ public void AddressPostalCodeTest()
         /// <summary>
         /// Test the property 'AddressCountry'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressCountryTest()
         {
             // TODO unit test for the property 'AddressCountry'
@@ -156,7 +157,7 @@ public void AddressCountryTest()
         /// <summary>
         /// Test the property 'OrganizationName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void OrganizationNameTest()
         {
             // TODO unit test for the property 'OrganizationName'
@@ -164,7 +165,7 @@ public void OrganizationNameTest()
         /// <summary>
         /// Test the property 'Custom2'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void Custom2Test()
         {
             // TODO unit test for the property 'Custom2'
@@ -172,7 +173,7 @@ public void Custom2Test()
         /// <summary>
         /// Test the property 'Custom3'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void Custom3Test()
         {
             // TODO unit test for the property 'Custom3'
@@ -180,7 +181,7 @@ public void Custom3Test()
         /// <summary>
         /// Test the property 'Custom4'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void Custom4Test()
         {
             // TODO unit test for the property 'Custom4'
@@ -188,7 +189,7 @@ public void Custom4Test()
         /// <summary>
         /// Test the property 'LastName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void LastNameTest()
         {
             // TODO unit test for the property 'LastName'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/FieldsTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/FieldsTests.cs
index fdfec96..78ad10a 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/FieldsTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/FieldsTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class FieldsTests
     {
         // TODO uncomment below to declare an instance variable for Fields
@@ -38,7 +38,7 @@ public class FieldsTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of Fields
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of Fields
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FieldsInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" Fields
@@ -68,7 +68,7 @@ public void FieldsInstanceTest()
         /// <summary>
         /// Test the property '_Fields'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void _FieldsTest()
         {
             // TODO unit test for the property '_Fields'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/ForgotPasswordTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/ForgotPasswordTests.cs
index 5e6b41a..3fedd88 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/ForgotPasswordTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/ForgotPasswordTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class ForgotPasswordTests
     {
         // TODO uncomment below to declare an instance variable for ForgotPassword
@@ -38,7 +39,7 @@ public class ForgotPasswordTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of ForgotPassword
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of ForgotPassword
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ForgotPasswordInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" ForgotPassword
@@ -68,7 +69,7 @@ public void ForgotPasswordInstanceTest()
         /// <summary>
         /// Test the property 'Username'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UsernameTest()
         {
             // TODO unit test for the property 'Username'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/ForgotUsernameTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/ForgotUsernameTests.cs
index f5c707a..156743b 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/ForgotUsernameTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/ForgotUsernameTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class ForgotUsernameTests
     {
         // TODO uncomment below to declare an instance variable for ForgotUsername
@@ -38,7 +39,7 @@ public class ForgotUsernameTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of ForgotUsername
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of ForgotUsername
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ForgotUsernameInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" ForgotUsername
@@ -68,7 +69,7 @@ public void ForgotUsernameInstanceTest()
         /// <summary>
         /// Test the property 'Email'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailTest()
         {
             // TODO unit test for the property 'Email'
@@ -76,7 +77,7 @@ public void EmailTest()
         /// <summary>
         /// Test the property 'PhoneNumber'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PhoneNumberTest()
         {
             // TODO unit test for the property 'PhoneNumber'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/InboundFaxRuleTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/InboundFaxRuleTests.cs
index bff3cc7..7f6e985 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/InboundFaxRuleTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/InboundFaxRuleTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class InboundFaxRuleTests
     {
         // TODO uncomment below to declare an instance variable for InboundFaxRule
@@ -38,7 +39,7 @@ public class InboundFaxRuleTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of InboundFaxRule
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of InboundFaxRule
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InboundFaxRuleInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" InboundFaxRule
@@ -68,7 +69,7 @@ public void InboundFaxRuleInstanceTest()
         /// <summary>
         /// Test the property 'DedicatedNumber'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void DedicatedNumberTest()
         {
             // TODO unit test for the property 'DedicatedNumber'
@@ -76,7 +77,7 @@ public void DedicatedNumberTest()
         /// <summary>
         /// Test the property 'RuleName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void RuleNameTest()
         {
             // TODO unit test for the property 'RuleName'
@@ -84,7 +85,7 @@ public void RuleNameTest()
         /// <summary>
         /// Test the property 'Action'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ActionTest()
         {
             // TODO unit test for the property 'Action'
@@ -92,7 +93,7 @@ public void ActionTest()
         /// <summary>
         /// Test the property 'ActionAddress'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ActionAddressTest()
         {
             // TODO unit test for the property 'ActionAddress'
@@ -100,7 +101,7 @@ public void ActionAddressTest()
         /// <summary>
         /// Test the property 'Enabled'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EnabledTest()
         {
             // TODO unit test for the property 'Enabled'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/InboundSMSRuleTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/InboundSMSRuleTests.cs
index 1d92518..77ae909 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/InboundSMSRuleTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/InboundSMSRuleTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class InboundSMSRuleTests
     {
         // TODO uncomment below to declare an instance variable for InboundSMSRule
@@ -38,7 +39,7 @@ public class InboundSMSRuleTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of InboundSMSRule
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of InboundSMSRule
         /// </summary>
-        [Test]
+        [TestMethod]
         public void InboundSMSRuleInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" InboundSMSRule
@@ -68,7 +69,7 @@ public void InboundSMSRuleInstanceTest()
         /// <summary>
         /// Test the property 'DedicatedNumber'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void DedicatedNumberTest()
         {
             // TODO unit test for the property 'DedicatedNumber'
@@ -76,7 +77,7 @@ public void DedicatedNumberTest()
         /// <summary>
         /// Test the property 'RuleName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void RuleNameTest()
         {
             // TODO unit test for the property 'RuleName'
@@ -84,7 +85,7 @@ public void RuleNameTest()
         /// <summary>
         /// Test the property 'MessageSearchType'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MessageSearchTypeTest()
         {
             // TODO unit test for the property 'MessageSearchType'
@@ -92,7 +93,7 @@ public void MessageSearchTypeTest()
         /// <summary>
         /// Test the property 'MessageSearchTerm'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MessageSearchTermTest()
         {
             // TODO unit test for the property 'MessageSearchTerm'
@@ -100,7 +101,7 @@ public void MessageSearchTermTest()
         /// <summary>
         /// Test the property 'Action'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ActionTest()
         {
             // TODO unit test for the property 'Action'
@@ -108,7 +109,7 @@ public void ActionTest()
         /// <summary>
         /// Test the property 'ActionAddress'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ActionAddressTest()
         {
             // TODO unit test for the property 'ActionAddress'
@@ -116,7 +117,7 @@ public void ActionAddressTest()
         /// <summary>
         /// Test the property 'Enabled'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EnabledTest()
         {
             // TODO unit test for the property 'Enabled'
@@ -124,7 +125,7 @@ public void EnabledTest()
         /// <summary>
         /// Test the property 'WebhookType'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void WebhookTypeTest()
         {
             // TODO unit test for the property 'WebhookType'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/MmsCampaignTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/MmsCampaignTests.cs
index c1b75d3..0163178 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/MmsCampaignTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/MmsCampaignTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class MmsCampaignTests
     {
         // TODO uncomment below to declare an instance variable for MmsCampaign
@@ -38,7 +39,7 @@ public class MmsCampaignTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of MmsCampaign
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of MmsCampaign
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsCampaignInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" MmsCampaign
@@ -68,7 +69,7 @@ public void MmsCampaignInstanceTest()
         /// <summary>
         /// Test the property 'ListId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListIdTest()
         {
             // TODO unit test for the property 'ListId'
@@ -76,7 +77,7 @@ public void ListIdTest()
         /// <summary>
         /// Test the property 'Name'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void NameTest()
         {
             // TODO unit test for the property 'Name'
@@ -84,7 +85,7 @@ public void NameTest()
         /// <summary>
         /// Test the property 'Body'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void BodyTest()
         {
             // TODO unit test for the property 'Body'
@@ -92,7 +93,7 @@ public void BodyTest()
         /// <summary>
         /// Test the property 'From'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FromTest()
         {
             // TODO unit test for the property 'From'
@@ -100,7 +101,7 @@ public void FromTest()
         /// <summary>
         /// Test the property 'Schedule'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ScheduleTest()
         {
             // TODO unit test for the property 'Schedule'
@@ -108,7 +109,7 @@ public void ScheduleTest()
         /// <summary>
         /// Test the property 'Subject'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SubjectTest()
         {
             // TODO unit test for the property 'Subject'
@@ -116,7 +117,7 @@ public void SubjectTest()
         /// <summary>
         /// Test the property 'MediaFile'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MediaFileTest()
         {
             // TODO unit test for the property 'MediaFile'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/MmsMessageCollectionTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/MmsMessageCollectionTests.cs
index 8c75918..5e77646 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/MmsMessageCollectionTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/MmsMessageCollectionTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class MmsMessageCollectionTests
     {
         // TODO uncomment below to declare an instance variable for MmsMessageCollection
@@ -38,7 +39,7 @@ public class MmsMessageCollectionTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of MmsMessageCollection
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of MmsMessageCollection
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsMessageCollectionInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" MmsMessageCollection
@@ -68,7 +69,7 @@ public void MmsMessageCollectionInstanceTest()
         /// <summary>
         /// Test the property 'MediaFile'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MediaFileTest()
         {
             // TODO unit test for the property 'MediaFile'
@@ -76,7 +77,7 @@ public void MediaFileTest()
         /// <summary>
         /// Test the property 'Messages'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MessagesTest()
         {
             // TODO unit test for the property 'Messages'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/MmsMessageTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/MmsMessageTests.cs
index 6c171c8..3e4d4e6 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/MmsMessageTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/MmsMessageTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -19,6 +19,7 @@
 using IO.ClickSend.Client;
 using System.Reflection;
 using Newtonsoft.Json;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace IO.ClickSend.Test
 {
@@ -29,7 +30,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class MmsMessageTests
     {
         // TODO uncomment below to declare an instance variable for MmsMessage
@@ -38,7 +39,7 @@ public class MmsMessageTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of MmsMessage
@@ -48,7 +49,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +58,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of MmsMessage
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MmsMessageInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" MmsMessage
@@ -68,7 +69,7 @@ public void MmsMessageInstanceTest()
         /// <summary>
         /// Test the property 'To'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ToTest()
         {
             // TODO unit test for the property 'To'
@@ -76,7 +77,7 @@ public void ToTest()
         /// <summary>
         /// Test the property 'Body'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void BodyTest()
         {
             // TODO unit test for the property 'Body'
@@ -84,7 +85,7 @@ public void BodyTest()
         /// <summary>
         /// Test the property 'Subject'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SubjectTest()
         {
             // TODO unit test for the property 'Subject'
@@ -92,7 +93,7 @@ public void SubjectTest()
         /// <summary>
         /// Test the property 'From'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FromTest()
         {
             // TODO unit test for the property 'From'
@@ -100,7 +101,7 @@ public void FromTest()
         /// <summary>
         /// Test the property 'Country'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CountryTest()
         {
             // TODO unit test for the property 'Country'
@@ -108,7 +109,7 @@ public void CountryTest()
         /// <summary>
         /// Test the property 'Source'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SourceTest()
         {
             // TODO unit test for the property 'Source'
@@ -116,7 +117,7 @@ public void SourceTest()
         /// <summary>
         /// Test the property 'ListId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListIdTest()
         {
             // TODO unit test for the property 'ListId'
@@ -124,7 +125,7 @@ public void ListIdTest()
         /// <summary>
         /// Test the property 'Schedule'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ScheduleTest()
         {
             // TODO unit test for the property 'Schedule'
@@ -132,7 +133,7 @@ public void ScheduleTest()
         /// <summary>
         /// Test the property 'CustomString'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CustomStringTest()
         {
             // TODO unit test for the property 'CustomString'
@@ -140,7 +141,7 @@ public void CustomStringTest()
         /// <summary>
         /// Test the property 'FromEmail'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FromEmailTest()
         {
             // TODO unit test for the property 'FromEmail'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/PostLetterTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/PostLetterTests.cs
index 5c349c9..1a48223 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/PostLetterTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/PostLetterTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class PostLetterTests
     {
         // TODO uncomment below to declare an instance variable for PostLetter
@@ -38,7 +38,7 @@ public class PostLetterTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of PostLetter
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of PostLetter
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostLetterInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" PostLetter
@@ -68,7 +68,7 @@ public void PostLetterInstanceTest()
         /// <summary>
         /// Test the property 'FileUrl'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FileUrlTest()
         {
             // TODO unit test for the property 'FileUrl'
@@ -76,7 +76,7 @@ public void FileUrlTest()
         /// <summary>
         /// Test the property 'PriorityPost'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PriorityPostTest()
         {
             // TODO unit test for the property 'PriorityPost'
@@ -84,7 +84,7 @@ public void PriorityPostTest()
         /// <summary>
         /// Test the property 'Recipients'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void RecipientsTest()
         {
             // TODO unit test for the property 'Recipients'
@@ -92,7 +92,7 @@ public void RecipientsTest()
         /// <summary>
         /// Test the property 'TemplateUsed'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void TemplateUsedTest()
         {
             // TODO unit test for the property 'TemplateUsed'
@@ -100,7 +100,7 @@ public void TemplateUsedTest()
         /// <summary>
         /// Test the property 'Duplex'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void DuplexTest()
         {
             // TODO unit test for the property 'Duplex'
@@ -108,7 +108,7 @@ public void DuplexTest()
         /// <summary>
         /// Test the property 'Colour'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ColourTest()
         {
             // TODO unit test for the property 'Colour'
@@ -116,7 +116,7 @@ public void ColourTest()
         /// <summary>
         /// Test the property 'Source'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SourceTest()
         {
             // TODO unit test for the property 'Source'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/PostPostcardTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/PostPostcardTests.cs
index c24ec2c..c36b0ad 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/PostPostcardTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/PostPostcardTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class PostPostcardTests
     {
         // TODO uncomment below to declare an instance variable for PostPostcard
@@ -38,7 +38,7 @@ public class PostPostcardTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of PostPostcard
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of PostPostcard
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostPostcardInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" PostPostcard
@@ -68,7 +68,7 @@ public void PostPostcardInstanceTest()
         /// <summary>
         /// Test the property 'FileUrls'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FileUrlsTest()
         {
             // TODO unit test for the property 'FileUrls'
@@ -76,7 +76,7 @@ public void FileUrlsTest()
         /// <summary>
         /// Test the property 'Recipients'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void RecipientsTest()
         {
             // TODO unit test for the property 'Recipients'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/PostRecipientTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/PostRecipientTests.cs
index 82be596..0d621e0 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/PostRecipientTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/PostRecipientTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class PostRecipientTests
     {
         // TODO uncomment below to declare an instance variable for PostRecipient
@@ -38,7 +38,7 @@ public class PostRecipientTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of PostRecipient
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of PostRecipient
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PostRecipientInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" PostRecipient
@@ -68,7 +68,7 @@ public void PostRecipientInstanceTest()
         /// <summary>
         /// Test the property 'AddressName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressNameTest()
         {
             // TODO unit test for the property 'AddressName'
@@ -76,7 +76,7 @@ public void AddressNameTest()
         /// <summary>
         /// Test the property 'AddressLine1'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressLine1Test()
         {
             // TODO unit test for the property 'AddressLine1'
@@ -84,7 +84,7 @@ public void AddressLine1Test()
         /// <summary>
         /// Test the property 'AddressLine2'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressLine2Test()
         {
             // TODO unit test for the property 'AddressLine2'
@@ -92,7 +92,7 @@ public void AddressLine2Test()
         /// <summary>
         /// Test the property 'AddressCity'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressCityTest()
         {
             // TODO unit test for the property 'AddressCity'
@@ -100,7 +100,7 @@ public void AddressCityTest()
         /// <summary>
         /// Test the property 'AddressState'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressStateTest()
         {
             // TODO unit test for the property 'AddressState'
@@ -108,7 +108,7 @@ public void AddressStateTest()
         /// <summary>
         /// Test the property 'AddressPostalCode'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressPostalCodeTest()
         {
             // TODO unit test for the property 'AddressPostalCode'
@@ -116,7 +116,7 @@ public void AddressPostalCodeTest()
         /// <summary>
         /// Test the property 'AddressCountry'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AddressCountryTest()
         {
             // TODO unit test for the property 'AddressCountry'
@@ -124,7 +124,7 @@ public void AddressCountryTest()
         /// <summary>
         /// Test the property 'ReturnAddressId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ReturnAddressIdTest()
         {
             // TODO unit test for the property 'ReturnAddressId'
@@ -132,7 +132,7 @@ public void ReturnAddressIdTest()
         /// <summary>
         /// Test the property 'Schedule'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ScheduleTest()
         {
             // TODO unit test for the property 'Schedule'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/ResellerAccountTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/ResellerAccountTests.cs
index 7cd4acd..5db0a4f 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/ResellerAccountTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/ResellerAccountTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class ResellerAccountTests
     {
         // TODO uncomment below to declare an instance variable for ResellerAccount
@@ -38,7 +38,7 @@ public class ResellerAccountTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of ResellerAccount
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of ResellerAccount
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ResellerAccountInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" ResellerAccount
@@ -68,7 +68,7 @@ public void ResellerAccountInstanceTest()
         /// <summary>
         /// Test the property 'Username'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UsernameTest()
         {
             // TODO unit test for the property 'Username'
@@ -76,7 +76,7 @@ public void UsernameTest()
         /// <summary>
         /// Test the property 'Password'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PasswordTest()
         {
             // TODO unit test for the property 'Password'
@@ -84,7 +84,7 @@ public void PasswordTest()
         /// <summary>
         /// Test the property 'UserEmail'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UserEmailTest()
         {
             // TODO unit test for the property 'UserEmail'
@@ -92,7 +92,7 @@ public void UserEmailTest()
         /// <summary>
         /// Test the property 'UserPhone'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UserPhoneTest()
         {
             // TODO unit test for the property 'UserPhone'
@@ -100,7 +100,7 @@ public void UserPhoneTest()
         /// <summary>
         /// Test the property 'UserFirstName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UserFirstNameTest()
         {
             // TODO unit test for the property 'UserFirstName'
@@ -108,7 +108,7 @@ public void UserFirstNameTest()
         /// <summary>
         /// Test the property 'UserLastName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UserLastNameTest()
         {
             // TODO unit test for the property 'UserLastName'
@@ -116,7 +116,7 @@ public void UserLastNameTest()
         /// <summary>
         /// Test the property 'AccountName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccountNameTest()
         {
             // TODO unit test for the property 'AccountName'
@@ -124,7 +124,7 @@ public void AccountNameTest()
         /// <summary>
         /// Test the property 'Country'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CountryTest()
         {
             // TODO unit test for the property 'Country'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/ResellerAccountTransferCreditTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/ResellerAccountTransferCreditTests.cs
index c2ff3e4..984e508 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/ResellerAccountTransferCreditTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/ResellerAccountTransferCreditTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class ResellerAccountTransferCreditTests
     {
         // TODO uncomment below to declare an instance variable for ResellerAccountTransferCredit
@@ -38,7 +38,7 @@ public class ResellerAccountTransferCreditTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of ResellerAccountTransferCredit
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of ResellerAccountTransferCredit
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ResellerAccountTransferCreditInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" ResellerAccountTransferCredit
@@ -68,7 +68,7 @@ public void ResellerAccountTransferCreditInstanceTest()
         /// <summary>
         /// Test the property 'ClientUserId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ClientUserIdTest()
         {
             // TODO unit test for the property 'ClientUserId'
@@ -76,7 +76,7 @@ public void ClientUserIdTest()
         /// <summary>
         /// Test the property 'Balance'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void BalanceTest()
         {
             // TODO unit test for the property 'Balance'
@@ -84,7 +84,7 @@ public void BalanceTest()
         /// <summary>
         /// Test the property 'Currency'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CurrencyTest()
         {
             // TODO unit test for the property 'Currency'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/SmsCampaignTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/SmsCampaignTests.cs
index 5ea69cb..95a0fab 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/SmsCampaignTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/SmsCampaignTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class SmsCampaignTests
     {
         // TODO uncomment below to declare an instance variable for SmsCampaign
@@ -38,7 +38,7 @@ public class SmsCampaignTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of SmsCampaign
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of SmsCampaign
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsCampaignInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" SmsCampaign
@@ -68,7 +68,7 @@ public void SmsCampaignInstanceTest()
         /// <summary>
         /// Test the property 'ListId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListIdTest()
         {
             // TODO unit test for the property 'ListId'
@@ -76,7 +76,7 @@ public void ListIdTest()
         /// <summary>
         /// Test the property 'Name'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void NameTest()
         {
             // TODO unit test for the property 'Name'
@@ -84,7 +84,7 @@ public void NameTest()
         /// <summary>
         /// Test the property 'Body'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void BodyTest()
         {
             // TODO unit test for the property 'Body'
@@ -92,7 +92,7 @@ public void BodyTest()
         /// <summary>
         /// Test the property 'From'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FromTest()
         {
             // TODO unit test for the property 'From'
@@ -100,7 +100,7 @@ public void FromTest()
         /// <summary>
         /// Test the property 'Schedule'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ScheduleTest()
         {
             // TODO unit test for the property 'Schedule'
@@ -108,7 +108,7 @@ public void ScheduleTest()
         /// <summary>
         /// Test the property 'UrlToShorten'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UrlToShortenTest()
         {
             // TODO unit test for the property 'UrlToShorten'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/SmsMessageCollectionTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/SmsMessageCollectionTests.cs
index a397e83..d772257 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/SmsMessageCollectionTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/SmsMessageCollectionTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class SmsMessageCollectionTests
     {
         // TODO uncomment below to declare an instance variable for SmsMessageCollection
@@ -38,7 +38,7 @@ public class SmsMessageCollectionTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of SmsMessageCollection
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of SmsMessageCollection
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsMessageCollectionInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" SmsMessageCollection
@@ -68,7 +68,7 @@ public void SmsMessageCollectionInstanceTest()
         /// <summary>
         /// Test the property 'Messages'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MessagesTest()
         {
             // TODO unit test for the property 'Messages'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/SmsMessageTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/SmsMessageTests.cs
index b206da7..ecdd97b 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/SmsMessageTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/SmsMessageTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class SmsMessageTests
     {
         // TODO uncomment below to declare an instance variable for SmsMessage
@@ -38,7 +38,7 @@ public class SmsMessageTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of SmsMessage
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of SmsMessage
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsMessageInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" SmsMessage
@@ -68,7 +68,7 @@ public void SmsMessageInstanceTest()
         /// <summary>
         /// Test the property 'From'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FromTest()
         {
             // TODO unit test for the property 'From'
@@ -76,7 +76,7 @@ public void FromTest()
         /// <summary>
         /// Test the property 'Body'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void BodyTest()
         {
             // TODO unit test for the property 'Body'
@@ -84,7 +84,7 @@ public void BodyTest()
         /// <summary>
         /// Test the property 'To'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ToTest()
         {
             // TODO unit test for the property 'To'
@@ -92,7 +92,7 @@ public void ToTest()
         /// <summary>
         /// Test the property 'Source'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SourceTest()
         {
             // TODO unit test for the property 'Source'
@@ -100,7 +100,7 @@ public void SourceTest()
         /// <summary>
         /// Test the property 'Schedule'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ScheduleTest()
         {
             // TODO unit test for the property 'Schedule'
@@ -108,7 +108,7 @@ public void ScheduleTest()
         /// <summary>
         /// Test the property 'CustomString'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CustomStringTest()
         {
             // TODO unit test for the property 'CustomString'
@@ -116,7 +116,7 @@ public void CustomStringTest()
         /// <summary>
         /// Test the property 'ListId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListIdTest()
         {
             // TODO unit test for the property 'ListId'
@@ -124,7 +124,7 @@ public void ListIdTest()
         /// <summary>
         /// Test the property 'Country'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CountryTest()
         {
             // TODO unit test for the property 'Country'
@@ -132,7 +132,7 @@ public void CountryTest()
         /// <summary>
         /// Test the property 'FromEmail'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FromEmailTest()
         {
             // TODO unit test for the property 'FromEmail'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/SmsTemplateTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/SmsTemplateTests.cs
index 1c0473a..4047e45 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/SmsTemplateTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/SmsTemplateTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class SmsTemplateTests
     {
         // TODO uncomment below to declare an instance variable for SmsTemplate
@@ -38,7 +38,7 @@ public class SmsTemplateTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of SmsTemplate
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of SmsTemplate
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SmsTemplateInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" SmsTemplate
@@ -68,7 +68,7 @@ public void SmsTemplateInstanceTest()
         /// <summary>
         /// Test the property 'TemplateName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void TemplateNameTest()
         {
             // TODO unit test for the property 'TemplateName'
@@ -76,7 +76,7 @@ public void TemplateNameTest()
         /// <summary>
         /// Test the property 'Body'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void BodyTest()
         {
             // TODO unit test for the property 'Body'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/StrippedStringTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/StrippedStringTests.cs
index 2133212..dc08bb4 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/StrippedStringTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/StrippedStringTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class StrippedStringTests
     {
         // TODO uncomment below to declare an instance variable for StrippedString
@@ -38,7 +38,7 @@ public class StrippedStringTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of StrippedString
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of StrippedString
         /// </summary>
-        [Test]
+        [TestMethod]
         public void StrippedStringInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" StrippedString
@@ -68,7 +68,7 @@ public void StrippedStringInstanceTest()
         /// <summary>
         /// Test the property 'StripString'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void StripStringTest()
         {
             // TODO unit test for the property 'StripString'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/SubaccountTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/SubaccountTests.cs
index e22a96b..49f6942 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/SubaccountTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/SubaccountTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class SubaccountTests
     {
         // TODO uncomment below to declare an instance variable for Subaccount
@@ -38,7 +38,7 @@ public class SubaccountTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of Subaccount
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of Subaccount
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SubaccountInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" Subaccount
@@ -68,7 +68,7 @@ public void SubaccountInstanceTest()
         /// <summary>
         /// Test the property 'ApiUsername'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ApiUsernameTest()
         {
             // TODO unit test for the property 'ApiUsername'
@@ -76,7 +76,7 @@ public void ApiUsernameTest()
         /// <summary>
         /// Test the property 'Password'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PasswordTest()
         {
             // TODO unit test for the property 'Password'
@@ -84,7 +84,7 @@ public void PasswordTest()
         /// <summary>
         /// Test the property 'Email'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void EmailTest()
         {
             // TODO unit test for the property 'Email'
@@ -92,7 +92,7 @@ public void EmailTest()
         /// <summary>
         /// Test the property 'PhoneNumber'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void PhoneNumberTest()
         {
             // TODO unit test for the property 'PhoneNumber'
@@ -100,7 +100,7 @@ public void PhoneNumberTest()
         /// <summary>
         /// Test the property 'FirstName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void FirstNameTest()
         {
             // TODO unit test for the property 'FirstName'
@@ -108,7 +108,7 @@ public void FirstNameTest()
         /// <summary>
         /// Test the property 'LastName'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void LastNameTest()
         {
             // TODO unit test for the property 'LastName'
@@ -116,7 +116,7 @@ public void LastNameTest()
         /// <summary>
         /// Test the property 'AccessUsers'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccessUsersTest()
         {
             // TODO unit test for the property 'AccessUsers'
@@ -124,7 +124,7 @@ public void AccessUsersTest()
         /// <summary>
         /// Test the property 'AccessBilling'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccessBillingTest()
         {
             // TODO unit test for the property 'AccessBilling'
@@ -132,7 +132,7 @@ public void AccessBillingTest()
         /// <summary>
         /// Test the property 'AccessReporting'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccessReportingTest()
         {
             // TODO unit test for the property 'AccessReporting'
@@ -140,7 +140,7 @@ public void AccessReportingTest()
         /// <summary>
         /// Test the property 'AccessContacts'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccessContactsTest()
         {
             // TODO unit test for the property 'AccessContacts'
@@ -148,7 +148,7 @@ public void AccessContactsTest()
         /// <summary>
         /// Test the property 'AccessSettings'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void AccessSettingsTest()
         {
             // TODO unit test for the property 'AccessSettings'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/UploadFileTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/UploadFileTests.cs
index f72b4cb..62d7d79 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/UploadFileTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/UploadFileTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class UploadFileTests
     {
         // TODO uncomment below to declare an instance variable for UploadFile
@@ -38,7 +38,7 @@ public class UploadFileTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of UploadFile
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of UploadFile
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UploadFileInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" UploadFile
@@ -68,7 +68,7 @@ public void UploadFileInstanceTest()
         /// <summary>
         /// Test the property 'Content'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ContentTest()
         {
             // TODO unit test for the property 'Content'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/UrlTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/UrlTests.cs
index 708f358..32157db 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/UrlTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/UrlTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class UrlTests
     {
         // TODO uncomment below to declare an instance variable for Url
@@ -38,7 +38,7 @@ public class UrlTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of Url
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of Url
         /// </summary>
-        [Test]
+        [TestMethod]
         public void UrlInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" Url
@@ -68,7 +68,7 @@ public void UrlInstanceTest()
         /// <summary>
         /// Test the property '_Url'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void _UrlTest()
         {
             // TODO unit test for the property '_Url'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/VoiceMessageCollectionTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/VoiceMessageCollectionTests.cs
index 6cfead2..48d7a73 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/VoiceMessageCollectionTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/VoiceMessageCollectionTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class VoiceMessageCollectionTests
     {
         // TODO uncomment below to declare an instance variable for VoiceMessageCollection
@@ -38,7 +38,7 @@ public class VoiceMessageCollectionTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of VoiceMessageCollection
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of VoiceMessageCollection
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceMessageCollectionInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" VoiceMessageCollection
@@ -68,7 +68,7 @@ public void VoiceMessageCollectionInstanceTest()
         /// <summary>
         /// Test the property 'Messages'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MessagesTest()
         {
             // TODO unit test for the property 'Messages'
diff --git a/src/IO.ClickSend.Test/ClickSend.Model/VoiceMessageTests.cs b/src/IO.ClickSend.Test/ClickSend.Model/VoiceMessageTests.cs
index ed090eb..272276f 100644
--- a/src/IO.ClickSend.Test/ClickSend.Model/VoiceMessageTests.cs
+++ b/src/IO.ClickSend.Test/ClickSend.Model/VoiceMessageTests.cs
@@ -8,7 +8,7 @@
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  */
 
-using NUnit.Framework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using System;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace IO.ClickSend.Test
     /// This file is automatically generated by ClickSend Codegen.
     /// Please update the test case below to test the model.
     /// </remarks>
-    [TestFixture]
+    [TestClass]
     public class VoiceMessageTests
     {
         // TODO uncomment below to declare an instance variable for VoiceMessage
@@ -38,7 +38,7 @@ public class VoiceMessageTests
         /// <summary>
         /// Setup before each test
         /// </summary>
-        [SetUp]
+        [TestInitialize]
         public void Init()
         {
             // TODO uncomment below to create an instance of VoiceMessage
@@ -48,7 +48,7 @@ public void Init()
         /// <summary>
         /// Clean up after each test
         /// </summary>
-        [TearDown]
+        [TestCleanup]
         public void Cleanup()
         {
 
@@ -57,7 +57,7 @@ public void Cleanup()
         /// <summary>
         /// Test an instance of VoiceMessage
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceMessageInstanceTest()
         {
             // TODO uncomment below to test "IsInstanceOfType" VoiceMessage
@@ -68,7 +68,7 @@ public void VoiceMessageInstanceTest()
         /// <summary>
         /// Test the property 'To'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ToTest()
         {
             // TODO unit test for the property 'To'
@@ -76,7 +76,7 @@ public void ToTest()
         /// <summary>
         /// Test the property 'Body'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void BodyTest()
         {
             // TODO unit test for the property 'Body'
@@ -84,7 +84,7 @@ public void BodyTest()
         /// <summary>
         /// Test the property 'Voice'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void VoiceTest()
         {
             // TODO unit test for the property 'Voice'
@@ -92,7 +92,7 @@ public void VoiceTest()
         /// <summary>
         /// Test the property 'CustomString'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CustomStringTest()
         {
             // TODO unit test for the property 'CustomString'
@@ -100,7 +100,7 @@ public void CustomStringTest()
         /// <summary>
         /// Test the property 'Country'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void CountryTest()
         {
             // TODO unit test for the property 'Country'
@@ -108,7 +108,7 @@ public void CountryTest()
         /// <summary>
         /// Test the property 'Source'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void SourceTest()
         {
             // TODO unit test for the property 'Source'
@@ -116,7 +116,7 @@ public void SourceTest()
         /// <summary>
         /// Test the property 'ListId'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ListIdTest()
         {
             // TODO unit test for the property 'ListId'
@@ -124,7 +124,7 @@ public void ListIdTest()
         /// <summary>
         /// Test the property 'Lang'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void LangTest()
         {
             // TODO unit test for the property 'Lang'
@@ -132,7 +132,7 @@ public void LangTest()
         /// <summary>
         /// Test the property 'Schedule'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void ScheduleTest()
         {
             // TODO unit test for the property 'Schedule'
@@ -140,7 +140,7 @@ public void ScheduleTest()
         /// <summary>
         /// Test the property 'RequireInput'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void RequireInputTest()
         {
             // TODO unit test for the property 'RequireInput'
@@ -148,7 +148,7 @@ public void RequireInputTest()
         /// <summary>
         /// Test the property 'MachineDetection'
         /// </summary>
-        [Test]
+        [TestMethod]
         public void MachineDetectionTest()
         {
             // TODO unit test for the property 'MachineDetection'
diff --git a/src/IO.ClickSend.Test/IO.ClickSend.Test.csproj b/src/IO.ClickSend.Test/IO.ClickSend.Test.csproj
index 40cccc6..75ac827 100644
--- a/src/IO.ClickSend.Test/IO.ClickSend.Test.csproj
+++ b/src/IO.ClickSend.Test/IO.ClickSend.Test.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 ClickSend v3 API
 
@@ -16,8 +16,11 @@ Contact: support@clicksend.com
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>IO.ClickSend.Test</RootNamespace>
     <AssemblyName>IO.ClickSend.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,8 +40,53 @@ Contact: support@clicksend.com
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="JsonSubTypes, Version=2.0.1.0, Culture=neutral, PublicKeyToken=ee75fc290dbc1176, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\JsonSubTypes.2.0.1\lib\net45\JsonSubTypes.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MSTest.TestFramework.3.6.4\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MSTest.TestFramework.3.6.4\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="RestSharp, Version=112.1.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\RestSharp.112.1.0\lib\net471\RestSharp.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=8.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -46,44 +94,19 @@ Contact: support@clicksend.com
     <Reference Include="System.Data" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
-    <Reference Include="Newtonsoft.Json">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="JsonSubTypes">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-    </Reference>
-    <Reference Include="RestSharp">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="**\*.cs"
-             Exclude="obj\**"/>
+    <Compile Include="**\*.cs" Exclude="obj\**" />
   </ItemGroup>
   <ItemGroup>
-      <None Include="packages.config" />
+    <None Include="app.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-      <ProjectReference Include="..\IO.ClickSend\IO.ClickSend.csproj">
-          <Project>{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}</Project>
-          <Name>IO.ClickSend</Name>
-      </ProjectReference>
+    <ProjectReference Include="..\IO.ClickSend\IO.ClickSend.csproj">
+      <Project>{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}</Project>
+      <Name>IO.ClickSend</Name>
+    </ProjectReference>
   </ItemGroup>
-</Project>
-
+</Project>
\ No newline at end of file
diff --git a/src/IO.ClickSend.Test/app.config b/src/IO.ClickSend.Test/app.config
new file mode 100644
index 0000000..97cb42c
--- /dev/null
+++ b/src/IO.ClickSend.Test/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>
diff --git a/src/IO.ClickSend.Test/packages.config b/src/IO.ClickSend.Test/packages.config
index ac390c1..31c6bee 100644
--- a/src/IO.ClickSend.Test/packages.config
+++ b/src/IO.ClickSend.Test/packages.config
@@ -1,7 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
-  <package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" developmentDependency="true" />
-  <package id="JsonSubTypes" version="1.2.0" targetFramework="net45" developmentDependency="true" />
-</packages>
+  <package id="JsonSubTypes" version="2.0.1" targetFramework="net45" developmentDependency="true" requireReinstallation="true" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
+  <package id="MSTest.TestFramework" version="3.6.4" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net45" developmentDependency="true" />
+  <package id="RestSharp" version="112.1.0" targetFramework="net472" developmentDependency="true" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
+  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net472" />
+  <package id="System.Text.Json" version="8.0.4" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
+</packages>
\ No newline at end of file
diff --git a/src/IO.ClickSend/ClickSend.Api/AccountApi.cs b/src/IO.ClickSend/ClickSend.Api/AccountApi.cs
index f62409a..d119513 100644
--- a/src/IO.ClickSend/ClickSend.Api/AccountApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/AccountApi.cs
@@ -415,7 +415,7 @@ public AccountApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -520,8 +520,8 @@ public ApiResponse< string > AccountGetWithHttpInfo ()
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -586,8 +586,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> AccountGetAsyncWit
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -665,8 +665,8 @@ public ApiResponse< string > AccountPostWithHttpInfo (Account body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -745,8 +745,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> AccountPostAsyncWi
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -822,8 +822,8 @@ public ApiResponse< string > AccountUseageBySubaccountGetWithHttpInfo (int? year
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -900,8 +900,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> AccountUseageBySub
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -979,8 +979,8 @@ public ApiResponse< string > AccountVerifySendPutWithHttpInfo (AccountVerify bod
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1059,8 +1059,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> AccountVerifySendP
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1130,8 +1130,8 @@ public ApiResponse< string > AccountVerifyVerifyByActivationTokenPutWithHttpInfo
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1202,8 +1202,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> AccountVerifyVerif
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1278,8 +1278,8 @@ public ApiResponse< string > ForgotPasswordPutWithHttpInfo (ForgotPassword body
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1355,8 +1355,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ForgotPasswordPutA
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1434,8 +1434,8 @@ public ApiResponse< string > ForgotPasswordVerifyPutWithHttpInfo (AccountForgotP
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1514,8 +1514,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ForgotPasswordVeri
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1584,8 +1584,8 @@ public ApiResponse< string > ForgotUsernamePutWithHttpInfo (ForgotUsername body
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1655,8 +1655,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ForgotUsernamePutA
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/AccountRechargeApi.cs b/src/IO.ClickSend/ClickSend.Api/AccountRechargeApi.cs
index e1bcbfd..058dfeb 100644
--- a/src/IO.ClickSend/ClickSend.Api/AccountRechargeApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/AccountRechargeApi.cs
@@ -331,7 +331,7 @@ public AccountRechargeApi(IO.ClickSend.Client.Configuration configuration = null
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -436,8 +436,8 @@ public ApiResponse< string > RechargeCreditCardGetWithHttpInfo ()
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -502,8 +502,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> RechargeCreditCard
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -581,8 +581,8 @@ public ApiResponse< string > RechargeCreditCardPutWithHttpInfo (CreditCard body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -661,8 +661,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> RechargeCreditCard
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -729,8 +729,8 @@ public ApiResponse< string > RechargePackagesGetWithHttpInfo (string country = n
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -798,8 +798,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> RechargePackagesGe
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -869,8 +869,8 @@ public ApiResponse< string > RechargePurchaseByPackageIdPutWithHttpInfo (int? pa
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -941,8 +941,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> RechargePurchaseBy
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1012,8 +1012,8 @@ public ApiResponse< string > RechargeTransactionsByTransactionIdGetWithHttpInfo
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1084,8 +1084,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> RechargeTransactio
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1155,8 +1155,8 @@ public ApiResponse< string > RechargeTransactionsGetWithHttpInfo (int? page = nu
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1227,8 +1227,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> RechargeTransactio
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/ContactApi.cs b/src/IO.ClickSend/ClickSend.Api/ContactApi.cs
index f88370e..ffe6ef1 100644
--- a/src/IO.ClickSend/ClickSend.Api/ContactApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/ContactApi.cs
@@ -467,7 +467,7 @@ public ContactApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -584,8 +584,8 @@ public ApiResponse< string > ListsContactsByListIdAndContactIdDeleteWithHttpInfo
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -662,8 +662,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsContactsByLis
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -739,8 +739,8 @@ public ApiResponse< string > ListsContactsByListIdAndContactIdGetWithHttpInfo (i
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -817,8 +817,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsContactsByLis
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -908,8 +908,8 @@ public ApiResponse< string > ListsContactsByListIdAndContactIdPutWithHttpInfo (C
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1000,8 +1000,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsContactsByLis
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1080,8 +1080,8 @@ public ApiResponse< string > ListsContactsByListIdGetWithHttpInfo (int? listId,
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1161,8 +1161,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsContactsByLis
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1246,8 +1246,8 @@ public ApiResponse< string > ListsContactsByListIdPostWithHttpInfo (Contact body
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1332,8 +1332,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsContactsByLis
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1415,8 +1415,8 @@ public ApiResponse< string > ListsCopyContactPutWithHttpInfo (int? fromListId, i
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1499,8 +1499,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsCopyContactPu
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1576,8 +1576,8 @@ public ApiResponse< string > ListsRemoveOptedOutContactsByListIdAndOptOutListIdP
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1654,8 +1654,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsRemoveOptedOu
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1737,8 +1737,8 @@ public ApiResponse< string > ListsTransferContactPutWithHttpInfo (int? fromListI
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1821,8 +1821,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsTransferConta
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/ContactListApi.cs b/src/IO.ClickSend/ClickSend.Api/ContactListApi.cs
index a7453de..9d6ce58 100644
--- a/src/IO.ClickSend/ClickSend.Api/ContactListApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/ContactListApi.cs
@@ -389,7 +389,7 @@ public ContactListApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -500,8 +500,8 @@ public ApiResponse< string > ListsByListIdDeleteWithHttpInfo (int? listId)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -572,8 +572,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsByListIdDelet
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -643,8 +643,8 @@ public ApiResponse< string > ListsByListIdGetWithHttpInfo (int? listId)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -715,8 +715,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsByListIdGetAs
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -800,8 +800,8 @@ public ApiResponse< string > ListsByListIdPutWithHttpInfo (ContactList body, int
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -886,8 +886,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsByListIdPutAs
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -957,8 +957,8 @@ public ApiResponse< string > ListsGetWithHttpInfo (int? page = null, int? limit
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1029,8 +1029,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsGetAsyncWithH
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1114,8 +1114,8 @@ public ApiResponse< string > ListsImportByListIdPostWithHttpInfo (ContactListImp
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1200,8 +1200,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsImportByListI
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1279,8 +1279,8 @@ public ApiResponse< string > ListsPostWithHttpInfo (ContactList body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1359,8 +1359,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsPostAsyncWith
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1444,8 +1444,8 @@ public ApiResponse< string > ListsRemoveDuplicatesByListIdPutWithHttpInfo (Field
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1530,8 +1530,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListsRemoveDuplica
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/CountriesApi.cs b/src/IO.ClickSend/ClickSend.Api/CountriesApi.cs
index ab90d07..e5a7d2e 100644
--- a/src/IO.ClickSend/ClickSend.Api/CountriesApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/CountriesApi.cs
@@ -116,7 +116,7 @@ public CountriesApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -215,8 +215,8 @@ public ApiResponse< string > CountriesGetWithHttpInfo ()
 
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -275,8 +275,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> CountriesGetAsyncW
 
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/DeliveryIssuesApi.cs b/src/IO.ClickSend/ClickSend.Api/DeliveryIssuesApi.cs
index 11d78a6..8fbd66f 100644
--- a/src/IO.ClickSend/ClickSend.Api/DeliveryIssuesApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/DeliveryIssuesApi.cs
@@ -167,7 +167,7 @@ public DeliveryIssuesApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -278,8 +278,8 @@ public ApiResponse< string > DeliveryIssuesGetWithHttpInfo (int? page = null, in
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -350,8 +350,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> DeliveryIssuesGetA
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -429,8 +429,8 @@ public ApiResponse< string > DeliveryIssuesPostWithHttpInfo (DeliveryIssue body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -509,8 +509,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> DeliveryIssuesPost
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/DetectAddressApi.cs b/src/IO.ClickSend/ClickSend.Api/DetectAddressApi.cs
index 7bea97b..208351b 100644
--- a/src/IO.ClickSend/ClickSend.Api/DetectAddressApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/DetectAddressApi.cs
@@ -121,7 +121,7 @@ public DetectAddressApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -240,8 +240,8 @@ public ApiResponse< string > DetectAddressPostWithHttpInfo (UploadFile body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -320,8 +320,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> DetectAddressPostA
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/EmailDeliveryReceiptRulesApi.cs b/src/IO.ClickSend/ClickSend.Api/EmailDeliveryReceiptRulesApi.cs
index ec9fbb4..e032a78 100644
--- a/src/IO.ClickSend/ClickSend.Api/EmailDeliveryReceiptRulesApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/EmailDeliveryReceiptRulesApi.cs
@@ -301,7 +301,7 @@ public EmailDeliveryReceiptRulesApi(IO.ClickSend.Client.Configuration configurat
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -412,8 +412,8 @@ public ApiResponse< string > EmailDeliveryReceiptAutomationDeleteWithHttpInfo (i
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -484,8 +484,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailDeliveryRecei
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -555,8 +555,8 @@ public ApiResponse< string > EmailDeliveryReceiptAutomationGetWithHttpInfo (int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -627,8 +627,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailDeliveryRecei
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -706,8 +706,8 @@ public ApiResponse< string > EmailDeliveryReceiptAutomationPostWithHttpInfo (Del
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -786,8 +786,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailDeliveryRecei
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -871,8 +871,8 @@ public ApiResponse< string > EmailDeliveryReceiptAutomationPutWithHttpInfo (Deli
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -957,8 +957,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailDeliveryRecei
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1031,8 +1031,8 @@ public ApiResponse< string > EmailDeliveryReceiptAutomationsGetWithHttpInfo (str
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1106,8 +1106,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailDeliveryRecei
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/EmailMarketingApi.cs b/src/IO.ClickSend/ClickSend.Api/EmailMarketingApi.cs
index aadd690..e1006b6 100644
--- a/src/IO.ClickSend/ClickSend.Api/EmailMarketingApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/EmailMarketingApi.cs
@@ -707,7 +707,7 @@ public EmailMarketingApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -818,8 +818,8 @@ public ApiResponse< string > AllowedEmailAddressGetWithHttpInfo (int? page = nul
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -890,8 +890,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> AllowedEmailAddres
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -966,8 +966,8 @@ public ApiResponse< string > AllowedEmailAddressPostWithHttpInfo (EmailAddress b
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1043,8 +1043,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> AllowedEmailAddres
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1114,8 +1114,8 @@ public ApiResponse< string > CancelEmailCampaignPutWithHttpInfo (int? emailCampa
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1186,8 +1186,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> CancelEmailCampaig
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1257,8 +1257,8 @@ public ApiResponse< string > EmailCampaignGetWithHttpInfo (int? emailCampaignId)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1329,8 +1329,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailCampaignGetAs
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1406,8 +1406,8 @@ public ApiResponse< string > EmailCampaignHistoryExportGetWithHttpInfo (int? ema
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1484,8 +1484,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailCampaignHisto
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1567,8 +1567,8 @@ public ApiResponse< string > EmailCampaignHistoryGetWithHttpInfo (int? emailCamp
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1651,8 +1651,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailCampaignHisto
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1730,8 +1730,8 @@ public ApiResponse< string > EmailCampaignPostWithHttpInfo (EmailCampaign body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1810,8 +1810,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailCampaignPostA
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1889,8 +1889,8 @@ public ApiResponse< string > EmailCampaignPricePostWithHttpInfo (EmailCampaign b
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1969,8 +1969,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailCampaignPrice
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2054,8 +2054,8 @@ public ApiResponse< string > EmailCampaignPutWithHttpInfo (EmailCampaign body, i
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2140,8 +2140,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailCampaignPutAs
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2211,8 +2211,8 @@ public ApiResponse< string > EmailCampaignsGetWithHttpInfo (int? page = null, in
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2283,8 +2283,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailCampaignsGetA
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2354,8 +2354,8 @@ public ApiResponse< string > SendVerificationTokenGetWithHttpInfo (int? emailAdd
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2426,8 +2426,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SendVerificationTo
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2497,8 +2497,8 @@ public ApiResponse< string > SpecificAllowedEmailAddressDeleteWithHttpInfo (int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2569,8 +2569,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SpecificAllowedEma
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2640,8 +2640,8 @@ public ApiResponse< string > SpecificAllowedEmailAddressGetWithHttpInfo (int? em
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2712,8 +2712,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SpecificAllowedEma
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2789,8 +2789,8 @@ public ApiResponse< string > VerifyAllowedEmailAddressGetWithHttpInfo (int? emai
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2867,8 +2867,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VerifyAllowedEmail
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/EmailToSmsApi.cs b/src/IO.ClickSend/ClickSend.Api/EmailToSmsApi.cs
index d8041d4..d9ed834 100644
--- a/src/IO.ClickSend/ClickSend.Api/EmailToSmsApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/EmailToSmsApi.cs
@@ -385,7 +385,7 @@ public EmailToSmsApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -496,8 +496,8 @@ public ApiResponse< string > SmsEmailSmsGetWithHttpInfo (int? page = null, int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -568,8 +568,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsEmailSmsGetAsyn
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -647,8 +647,8 @@ public ApiResponse< string > SmsEmailSmsPostWithHttpInfo (EmailSMSAddress body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -727,8 +727,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsEmailSmsPostAsy
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -798,8 +798,8 @@ public ApiResponse< string > SmsEmailSmsStrippedStringDeleteWithHttpInfo (int? r
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -870,8 +870,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsEmailSmsStrippe
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -941,8 +941,8 @@ public ApiResponse< string > SmsEmailSmsStrippedStringGetWithHttpInfo (int? rule
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1013,8 +1013,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsEmailSmsStrippe
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1092,8 +1092,8 @@ public ApiResponse< string > SmsEmailSmsStrippedStringPostWithHttpInfo (Stripped
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1172,8 +1172,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsEmailSmsStrippe
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1257,8 +1257,8 @@ public ApiResponse< string > SmsEmailSmsStrippedStringPutWithHttpInfo (StrippedS
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1343,8 +1343,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsEmailSmsStrippe
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1414,8 +1414,8 @@ public ApiResponse< string > SmsEmailSmsStrippedStringsGetWithHttpInfo (int? pag
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1486,8 +1486,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsEmailSmsStrippe
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/FAXApi.cs b/src/IO.ClickSend/ClickSend.Api/FAXApi.cs
index 5dead28..3689663 100644
--- a/src/IO.ClickSend/ClickSend.Api/FAXApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/FAXApi.cs
@@ -397,7 +397,7 @@ public FAXApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -520,8 +520,8 @@ public ApiResponse< string > FaxHistoryGetWithHttpInfo (int? dateFrom = null, in
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -604,8 +604,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxHistoryGetAsync
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -683,8 +683,8 @@ public ApiResponse< string > FaxPricePostWithHttpInfo (FaxMessageCollection body
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -763,8 +763,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxPricePostAsyncW
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -834,8 +834,8 @@ public ApiResponse< string > FaxReceiptsByMessageIdGetWithHttpInfo (string messa
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -906,8 +906,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxReceiptsByMessa
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -977,8 +977,8 @@ public ApiResponse< string > FaxReceiptsGetWithHttpInfo (int? page = null, int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1049,8 +1049,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxReceiptsGetAsyn
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1128,8 +1128,8 @@ public ApiResponse< string > FaxReceiptsPostWithHttpInfo (Url body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1208,8 +1208,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxReceiptsPostAsy
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1284,8 +1284,8 @@ public ApiResponse< string > FaxReceiptsReadPutWithHttpInfo (DateBefore body = n
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1361,8 +1361,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxReceiptsReadPut
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1440,8 +1440,8 @@ public ApiResponse< string > FaxSendPostWithHttpInfo (FaxMessageCollection body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1520,8 +1520,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxSendPostAsyncWi
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/FAXDeliveryReceiptRulesApi.cs b/src/IO.ClickSend/ClickSend.Api/FAXDeliveryReceiptRulesApi.cs
index 915c163..e72827e 100644
--- a/src/IO.ClickSend/ClickSend.Api/FAXDeliveryReceiptRulesApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/FAXDeliveryReceiptRulesApi.cs
@@ -301,7 +301,7 @@ public FAXDeliveryReceiptRulesApi(IO.ClickSend.Client.Configuration configuratio
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -412,8 +412,8 @@ public ApiResponse< string > FaxDeliveryReceiptAutomationDeleteWithHttpInfo (int
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -484,8 +484,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxDeliveryReceipt
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -555,8 +555,8 @@ public ApiResponse< string > FaxDeliveryReceiptAutomationGetWithHttpInfo (int? r
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -627,8 +627,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxDeliveryReceipt
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -706,8 +706,8 @@ public ApiResponse< string > FaxDeliveryReceiptAutomationPostWithHttpInfo (Deliv
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -786,8 +786,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxDeliveryReceipt
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -871,8 +871,8 @@ public ApiResponse< string > FaxDeliveryReceiptAutomationPutWithHttpInfo (Delive
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -957,8 +957,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxDeliveryReceipt
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1031,8 +1031,8 @@ public ApiResponse< string > FaxDeliveryReceiptAutomationsGetWithHttpInfo (strin
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1106,8 +1106,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxDeliveryReceipt
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/GlobalSendingApi.cs b/src/IO.ClickSend/ClickSend.Api/GlobalSendingApi.cs
index e6d881e..67e4f81 100644
--- a/src/IO.ClickSend/ClickSend.Api/GlobalSendingApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/GlobalSendingApi.cs
@@ -235,7 +235,7 @@ public GlobalSendingApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -340,8 +340,8 @@ public ApiResponse< string > ListCountriesGetWithHttpInfo ()
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -406,8 +406,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ListCountriesGetAs
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -471,8 +471,8 @@ public ApiResponse< string > UserCountriesAgreePostWithHttpInfo ()
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -537,8 +537,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> UserCountriesAgree
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -602,8 +602,8 @@ public ApiResponse< string > UserCountriesGetWithHttpInfo ()
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -668,8 +668,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> UserCountriesGetAs
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -747,8 +747,8 @@ public ApiResponse< string > UserCountriesPostWithHttpInfo (CountryListIds body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -827,8 +827,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> UserCountriesPostA
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/InboundFAXRulesApi.cs b/src/IO.ClickSend/ClickSend.Api/InboundFAXRulesApi.cs
index 7e5d4d8..7629911 100644
--- a/src/IO.ClickSend/ClickSend.Api/InboundFAXRulesApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/InboundFAXRulesApi.cs
@@ -301,7 +301,7 @@ public InboundFAXRulesApi(IO.ClickSend.Client.Configuration configuration = null
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -412,8 +412,8 @@ public ApiResponse< string > FaxInboundAutomationDeleteWithHttpInfo (int? inboun
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -484,8 +484,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxInboundAutomati
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -555,8 +555,8 @@ public ApiResponse< string > FaxInboundAutomationGetWithHttpInfo (int? inboundRu
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -627,8 +627,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxInboundAutomati
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -706,8 +706,8 @@ public ApiResponse< string > FaxInboundAutomationPostWithHttpInfo (InboundFaxRul
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -786,8 +786,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxInboundAutomati
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -871,8 +871,8 @@ public ApiResponse< string > FaxInboundAutomationPutWithHttpInfo (InboundFaxRule
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -957,8 +957,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxInboundAutomati
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1031,8 +1031,8 @@ public ApiResponse< string > FaxInboundAutomationsGetWithHttpInfo (string q = nu
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1106,8 +1106,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> FaxInboundAutomati
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/InboundSMSRulesApi.cs b/src/IO.ClickSend/ClickSend.Api/InboundSMSRulesApi.cs
index 534a2ef..ad209dd 100644
--- a/src/IO.ClickSend/ClickSend.Api/InboundSMSRulesApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/InboundSMSRulesApi.cs
@@ -301,7 +301,7 @@ public InboundSMSRulesApi(IO.ClickSend.Client.Configuration configuration = null
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -412,8 +412,8 @@ public ApiResponse< string > SmsInboundAutomationDeleteWithHttpInfo (int? inboun
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -484,8 +484,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsInboundAutomati
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -555,8 +555,8 @@ public ApiResponse< string > SmsInboundAutomationGetWithHttpInfo (int? inboundRu
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -627,8 +627,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsInboundAutomati
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -706,8 +706,8 @@ public ApiResponse< string > SmsInboundAutomationPostWithHttpInfo (InboundSMSRul
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -786,8 +786,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsInboundAutomati
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -871,8 +871,8 @@ public ApiResponse< string > SmsInboundAutomationPutWithHttpInfo (InboundSMSRule
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -957,8 +957,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsInboundAutomati
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1031,8 +1031,8 @@ public ApiResponse< string > SmsInboundAutomationsGetWithHttpInfo (string q = nu
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1106,8 +1106,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsInboundAutomati
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/MMSApi.cs b/src/IO.ClickSend/ClickSend.Api/MMSApi.cs
index 10a7a43..7d91e9b 100644
--- a/src/IO.ClickSend/ClickSend.Api/MMSApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/MMSApi.cs
@@ -351,7 +351,7 @@ public MMSApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -462,8 +462,8 @@ public ApiResponse< string > MmsHistoryExportGetWithHttpInfo (string filename)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -534,8 +534,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MmsHistoryExportGe
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -614,8 +614,8 @@ public ApiResponse< string > MmsHistoryGetWithHttpInfo (string q = null, int? da
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -695,8 +695,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MmsHistoryGetAsync
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -774,8 +774,8 @@ public ApiResponse< string > MmsPricePostWithHttpInfo (MmsMessageCollection body
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -854,8 +854,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MmsPricePostAsyncW
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -925,8 +925,8 @@ public ApiResponse< string > MmsReceiptsGetWithHttpInfo (int? page = null, int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -997,8 +997,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MmsReceiptsGetAsyn
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1073,8 +1073,8 @@ public ApiResponse< string > MmsReceiptsReadPutWithHttpInfo (DateBefore body = n
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1150,8 +1150,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MmsReceiptsReadPut
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1229,8 +1229,8 @@ public ApiResponse< string > MmsSendPostWithHttpInfo (MmsMessageCollection body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1309,8 +1309,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MmsSendPostAsyncWi
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/MasterEmailTemplatesApi.cs b/src/IO.ClickSend/ClickSend.Api/MasterEmailTemplatesApi.cs
index e5463e6..dd196e6 100644
--- a/src/IO.ClickSend/ClickSend.Api/MasterEmailTemplatesApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/MasterEmailTemplatesApi.cs
@@ -304,7 +304,7 @@ public MasterEmailTemplatesApi(IO.ClickSend.Client.Configuration configuration =
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -415,8 +415,8 @@ public ApiResponse< string > MasterEmailTemplateCategoriesGetWithHttpInfo (int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -487,8 +487,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MasterEmailTemplat
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -558,8 +558,8 @@ public ApiResponse< string > MasterEmailTemplateCategoryGetWithHttpInfo (int? ca
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -630,8 +630,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MasterEmailTemplat
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -701,8 +701,8 @@ public ApiResponse< string > MasterEmailTemplateGetWithHttpInfo (int? templateId
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -773,8 +773,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MasterEmailTemplat
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -844,8 +844,8 @@ public ApiResponse< string > MasterEmailTemplatesGetWithHttpInfo (int? page = nu
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -916,8 +916,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MasterEmailTemplat
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -993,8 +993,8 @@ public ApiResponse< string > MasterEmailTemplatesInCategoryGetWithHttpInfo (int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1071,8 +1071,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MasterEmailTemplat
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/MmsCampaignApi.cs b/src/IO.ClickSend/ClickSend.Api/MmsCampaignApi.cs
index a62d6ac..5f0538e 100644
--- a/src/IO.ClickSend/ClickSend.Api/MmsCampaignApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/MmsCampaignApi.cs
@@ -339,7 +339,7 @@ public MmsCampaignApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -450,8 +450,8 @@ public ApiResponse< string > MmsCampaignByMmsCampaignIdGetWithHttpInfo (int? mms
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -522,8 +522,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MmsCampaignByMmsCa
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -607,8 +607,8 @@ public ApiResponse< string > MmsCampaignsByMmsCampaignIdPutWithHttpInfo (MmsCamp
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -693,8 +693,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MmsCampaignsByMmsC
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -764,8 +764,8 @@ public ApiResponse< string > MmsCampaignsCancelByMmsCampaignIdPutWithHttpInfo (i
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -836,8 +836,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MmsCampaignsCancel
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -907,8 +907,8 @@ public ApiResponse< string > MmsCampaignsGetWithHttpInfo (int? page = null, int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -979,8 +979,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MmsCampaignsGetAsy
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1058,8 +1058,8 @@ public ApiResponse< string > MmsCampaignsPricePostWithHttpInfo (MmsCampaign body
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1138,8 +1138,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MmsCampaignsPriceP
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1217,8 +1217,8 @@ public ApiResponse< string > MmsCampaignsSendPostWithHttpInfo (MmsCampaign body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1297,8 +1297,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> MmsCampaignsSendPo
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/NumberApi.cs b/src/IO.ClickSend/ClickSend.Api/NumberApi.cs
index 6f05cef..6c97f23 100644
--- a/src/IO.ClickSend/ClickSend.Api/NumberApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/NumberApi.cs
@@ -224,7 +224,7 @@ public NumberApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -335,8 +335,8 @@ public ApiResponse< string > NumbersBuyByDedicatedNumberPostWithHttpInfo (string
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -407,8 +407,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> NumbersBuyByDedica
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -478,8 +478,8 @@ public ApiResponse< string > NumbersGetWithHttpInfo (int? page = null, int? limi
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -550,8 +550,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> NumbersGetAsyncWit
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -633,8 +633,8 @@ public ApiResponse< string > NumbersSearchByCountryGetWithHttpInfo (string count
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -717,8 +717,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> NumbersSearchByCou
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/PostLetterApi.cs b/src/IO.ClickSend/ClickSend.Api/PostLetterApi.cs
index 04b720a..3badce9 100644
--- a/src/IO.ClickSend/ClickSend.Api/PostLetterApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/PostLetterApi.cs
@@ -251,7 +251,7 @@ public PostLetterApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -362,8 +362,8 @@ public ApiResponse< string > PostLettersExportGetWithHttpInfo (string filename)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -434,8 +434,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> PostLettersExportG
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -505,8 +505,8 @@ public ApiResponse< string > PostLettersHistoryGetWithHttpInfo (int? page = null
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -577,8 +577,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> PostLettersHistory
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -656,8 +656,8 @@ public ApiResponse< string > PostLettersPricePostWithHttpInfo (PostLetter body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -736,8 +736,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> PostLettersPricePo
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -815,8 +815,8 @@ public ApiResponse< string > PostLettersSendPostWithHttpInfo (PostLetter body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -895,8 +895,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> PostLettersSendPos
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/PostPostcardApi.cs b/src/IO.ClickSend/ClickSend.Api/PostPostcardApi.cs
index 592a86f..b7b0b5b 100644
--- a/src/IO.ClickSend/ClickSend.Api/PostPostcardApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/PostPostcardApi.cs
@@ -251,7 +251,7 @@ public PostPostcardApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -362,8 +362,8 @@ public ApiResponse< string > PostPostcardsHistoryExportGetWithHttpInfo (string f
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -434,8 +434,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> PostPostcardsHisto
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -505,8 +505,8 @@ public ApiResponse< string > PostPostcardsHistoryGetWithHttpInfo (int? page = nu
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -577,8 +577,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> PostPostcardsHisto
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -656,8 +656,8 @@ public ApiResponse< string > PostPostcardsPricePostWithHttpInfo (PostPostcard bo
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -736,8 +736,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> PostPostcardsPrice
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -815,8 +815,8 @@ public ApiResponse< string > PostPostcardsSendPostWithHttpInfo (PostPostcard bod
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -895,8 +895,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> PostPostcardsSendP
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/PostReturnAddressApi.cs b/src/IO.ClickSend/ClickSend.Api/PostReturnAddressApi.cs
index f12c1ee..72f415d 100644
--- a/src/IO.ClickSend/ClickSend.Api/PostReturnAddressApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/PostReturnAddressApi.cs
@@ -297,7 +297,7 @@ public PostReturnAddressApi(IO.ClickSend.Client.Configuration configuration = nu
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -408,8 +408,8 @@ public ApiResponse< string > PostReturnAddressesByReturnAddressIdDeleteWithHttpI
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -480,8 +480,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> PostReturnAddresse
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -551,8 +551,8 @@ public ApiResponse< string > PostReturnAddressesByReturnAddressIdGetWithHttpInfo
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -623,8 +623,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> PostReturnAddresse
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -708,8 +708,8 @@ public ApiResponse< string > PostReturnAddressesByReturnAddressIdPutWithHttpInfo
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -794,8 +794,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> PostReturnAddresse
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -865,8 +865,8 @@ public ApiResponse< string > PostReturnAddressesGetWithHttpInfo (int? page = nul
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -937,8 +937,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> PostReturnAddresse
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1016,8 +1016,8 @@ public ApiResponse< string > PostReturnAddressesPostWithHttpInfo (Address body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1096,8 +1096,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> PostReturnAddresse
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/ReferralAccountApi.cs b/src/IO.ClickSend/ClickSend.Api/ReferralAccountApi.cs
index baaa19c..ecc1b3c 100644
--- a/src/IO.ClickSend/ClickSend.Api/ReferralAccountApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/ReferralAccountApi.cs
@@ -124,7 +124,7 @@ public ReferralAccountApi(IO.ClickSend.Client.Configuration configuration = null
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -235,8 +235,8 @@ public ApiResponse< string > ReferralAccountsGetWithHttpInfo (int? page = null,
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -307,8 +307,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ReferralAccountsGe
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/ResellerAccountApi.cs b/src/IO.ClickSend/ClickSend.Api/ResellerAccountApi.cs
index 2ccec6e..2ea05c8 100644
--- a/src/IO.ClickSend/ClickSend.Api/ResellerAccountApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/ResellerAccountApi.cs
@@ -255,7 +255,7 @@ public ResellerAccountApi(IO.ClickSend.Client.Configuration configuration = null
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -366,8 +366,8 @@ public ApiResponse< string > ResellerAccountsByClientUserIdGetWithHttpInfo (int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -438,8 +438,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ResellerAccountsBy
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -523,8 +523,8 @@ public ApiResponse< string > ResellerAccountsByClientUserIdPutWithHttpInfo (Rese
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -609,8 +609,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ResellerAccountsBy
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -680,8 +680,8 @@ public ApiResponse< string > ResellerAccountsGetWithHttpInfo (int? page = null,
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -752,8 +752,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ResellerAccountsGe
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -831,8 +831,8 @@ public ApiResponse< string > ResellerAccountsPostWithHttpInfo (ResellerAccount b
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -911,8 +911,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ResellerAccountsPo
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/SMSApi.cs b/src/IO.ClickSend/ClickSend.Api/SMSApi.cs
index 4c3ca7e..2cb74eb 100644
--- a/src/IO.ClickSend/ClickSend.Api/SMSApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/SMSApi.cs
@@ -867,7 +867,7 @@ public SMSApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -972,8 +972,8 @@ public ApiResponse< string > SmsCancelAllPutWithHttpInfo ()
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1038,8 +1038,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsCancelAllPutAsy
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1109,8 +1109,8 @@ public ApiResponse< string > SmsCancelByMessageIdPutWithHttpInfo (string message
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1181,8 +1181,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsCancelByMessage
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1252,8 +1252,8 @@ public ApiResponse< string > SmsHistoryExportGetWithHttpInfo (string filename)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1324,8 +1324,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsHistoryExportGe
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1404,8 +1404,8 @@ public ApiResponse< string > SmsHistoryGetWithHttpInfo (string q = null, int? da
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1485,8 +1485,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsHistoryGetAsync
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1559,8 +1559,8 @@ public ApiResponse< string > SmsInboundGetWithHttpInfo (string q = null, int? pa
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1634,8 +1634,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsInboundGetAsync
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1713,8 +1713,8 @@ public ApiResponse< string > SmsInboundPostWithHttpInfo (Url body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1793,8 +1793,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsInboundPostAsyn
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1864,8 +1864,8 @@ public ApiResponse< string > SmsInboundReadByMessageIdPutWithHttpInfo (string me
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1936,8 +1936,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsInboundReadByMe
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2012,8 +2012,8 @@ public ApiResponse< string > SmsInboundReadPutWithHttpInfo (DateBefore body = nu
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2089,8 +2089,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsInboundReadPutA
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2168,8 +2168,8 @@ public ApiResponse< string > SmsPricePostWithHttpInfo (SmsMessageCollection body
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2248,8 +2248,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsPricePostAsyncW
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2319,8 +2319,8 @@ public ApiResponse< string > SmsReceiptsByMessageIdGetWithHttpInfo (string messa
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2391,8 +2391,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsReceiptsByMessa
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2462,8 +2462,8 @@ public ApiResponse< string > SmsReceiptsGetWithHttpInfo (int? page = null, int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2534,8 +2534,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsReceiptsGetAsyn
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2613,8 +2613,8 @@ public ApiResponse< string > SmsReceiptsPostWithHttpInfo (Url body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2693,8 +2693,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsReceiptsPostAsy
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2769,8 +2769,8 @@ public ApiResponse< string > SmsReceiptsReadPutWithHttpInfo (DateBefore body = n
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2846,8 +2846,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsReceiptsReadPut
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2925,8 +2925,8 @@ public ApiResponse< string > SmsSendPostWithHttpInfo (SmsMessageCollection body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -3005,8 +3005,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsSendPostAsyncWi
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -3076,8 +3076,8 @@ public ApiResponse< string > SmsTemplatesByTemplateIdDeleteWithHttpInfo (int? te
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -3148,8 +3148,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsTemplatesByTemp
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -3233,8 +3233,8 @@ public ApiResponse< string > SmsTemplatesByTemplateIdPutWithHttpInfo (SmsTemplat
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -3319,8 +3319,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsTemplatesByTemp
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -3390,8 +3390,8 @@ public ApiResponse< string > SmsTemplatesGetWithHttpInfo (int? page = null, int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -3462,8 +3462,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsTemplatesGetAsy
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -3541,8 +3541,8 @@ public ApiResponse< string > SmsTemplatesPostWithHttpInfo (SmsTemplate body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -3621,8 +3621,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsTemplatesPostAs
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/SMSDeliveryReceiptRulesApi.cs b/src/IO.ClickSend/ClickSend.Api/SMSDeliveryReceiptRulesApi.cs
index f3bba72..405dc8e 100644
--- a/src/IO.ClickSend/ClickSend.Api/SMSDeliveryReceiptRulesApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/SMSDeliveryReceiptRulesApi.cs
@@ -301,7 +301,7 @@ public SMSDeliveryReceiptRulesApi(IO.ClickSend.Client.Configuration configuratio
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -412,8 +412,8 @@ public ApiResponse< string > SmsDeliveryReceiptAutomationDeleteWithHttpInfo (int
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -484,8 +484,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsDeliveryReceipt
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -555,8 +555,8 @@ public ApiResponse< string > SmsDeliveryReceiptAutomationGetWithHttpInfo (int? r
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -627,8 +627,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsDeliveryReceipt
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -706,8 +706,8 @@ public ApiResponse< string > SmsDeliveryReceiptAutomationPostWithHttpInfo (Deliv
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -786,8 +786,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsDeliveryReceipt
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -871,8 +871,8 @@ public ApiResponse< string > SmsDeliveryReceiptAutomationPutWithHttpInfo (Delive
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -957,8 +957,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsDeliveryReceipt
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1031,8 +1031,8 @@ public ApiResponse< string > SmsDeliveryReceiptAutomationsGetWithHttpInfo (strin
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1106,8 +1106,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsDeliveryReceipt
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/SearchApi.cs b/src/IO.ClickSend/ClickSend.Api/SearchApi.cs
index 488d9ea..49ac182 100644
--- a/src/IO.ClickSend/ClickSend.Api/SearchApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/SearchApi.cs
@@ -128,7 +128,7 @@ public SearchApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -245,8 +245,8 @@ public ApiResponse< string > SearchContactsListsGetWithHttpInfo (string q, int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -323,8 +323,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SearchContactsList
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/SmsCampaignApi.cs b/src/IO.ClickSend/ClickSend.Api/SmsCampaignApi.cs
index 5373ada..bc29d47 100644
--- a/src/IO.ClickSend/ClickSend.Api/SmsCampaignApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/SmsCampaignApi.cs
@@ -339,7 +339,7 @@ public SmsCampaignApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -450,8 +450,8 @@ public ApiResponse< string > SmsCampaignBySmsCampaignIdGetWithHttpInfo (int? sms
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -522,8 +522,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsCampaignBySmsCa
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -607,8 +607,8 @@ public ApiResponse< string > SmsCampaignsBySmsCampaignIdPutWithHttpInfo (SmsCamp
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -693,8 +693,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsCampaignsBySmsC
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -764,8 +764,8 @@ public ApiResponse< string > SmsCampaignsCancelBySmsCampaignIdPutWithHttpInfo (i
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -836,8 +836,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsCampaignsCancel
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -907,8 +907,8 @@ public ApiResponse< string > SmsCampaignsGetWithHttpInfo (int? page = null, int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -979,8 +979,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsCampaignsGetAsy
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1058,8 +1058,8 @@ public ApiResponse< string > SmsCampaignsPricePostWithHttpInfo (SmsCampaign body
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1138,8 +1138,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsCampaignsPriceP
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1217,8 +1217,8 @@ public ApiResponse< string > SmsCampaignsSendPostWithHttpInfo (SmsCampaign body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1297,8 +1297,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SmsCampaignsSendPo
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/StatisticsApi.cs b/src/IO.ClickSend/ClickSend.Api/StatisticsApi.cs
index 0149450..7f0bffa 100644
--- a/src/IO.ClickSend/ClickSend.Api/StatisticsApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/StatisticsApi.cs
@@ -154,7 +154,7 @@ public StatisticsApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -259,8 +259,8 @@ public ApiResponse< string > StatisticsSmsGetWithHttpInfo ()
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -325,8 +325,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> StatisticsSmsGetAs
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -390,8 +390,8 @@ public ApiResponse< string > StatisticsVoiceGetWithHttpInfo ()
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -456,8 +456,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> StatisticsVoiceGet
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/SubaccountApi.cs b/src/IO.ClickSend/ClickSend.Api/SubaccountApi.cs
index 2f452e2..98c8736 100644
--- a/src/IO.ClickSend/ClickSend.Api/SubaccountApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/SubaccountApi.cs
@@ -339,7 +339,7 @@ public SubaccountApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -450,8 +450,8 @@ public ApiResponse< string > SubaccountsBySubaccountIdDeleteWithHttpInfo (int? s
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -522,8 +522,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SubaccountsBySubac
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -593,8 +593,8 @@ public ApiResponse< string > SubaccountsBySubaccountIdGetWithHttpInfo (int? suba
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -665,8 +665,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SubaccountsBySubac
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -750,8 +750,8 @@ public ApiResponse< string > SubaccountsBySubaccountIdPutWithHttpInfo (Subaccoun
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -836,8 +836,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SubaccountsBySubac
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -907,8 +907,8 @@ public ApiResponse< string > SubaccountsGetWithHttpInfo (int? page = null, int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -979,8 +979,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SubaccountsGetAsyn
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1058,8 +1058,8 @@ public ApiResponse< string > SubaccountsPostWithHttpInfo (Subaccount body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1138,8 +1138,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SubaccountsPostAsy
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1209,8 +1209,8 @@ public ApiResponse< string > SubaccountsRegenApiKeyBySubaccountIdPutWithHttpInfo
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1281,8 +1281,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> SubaccountsRegenAp
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/TimezonesApi.cs b/src/IO.ClickSend/ClickSend.Api/TimezonesApi.cs
index 4d84321..b5d09da 100644
--- a/src/IO.ClickSend/ClickSend.Api/TimezonesApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/TimezonesApi.cs
@@ -124,7 +124,7 @@ public TimezonesApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -235,8 +235,8 @@ public ApiResponse< string > TimezonesGetWithHttpInfo (int? page = null, int? li
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -307,8 +307,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> TimezonesGetAsyncW
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/TransactionalEmailApi.cs b/src/IO.ClickSend/ClickSend.Api/TransactionalEmailApi.cs
index edff6d9..cff46dd 100644
--- a/src/IO.ClickSend/ClickSend.Api/TransactionalEmailApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/TransactionalEmailApi.cs
@@ -267,7 +267,7 @@ public TransactionalEmailApi(IO.ClickSend.Client.Configuration configuration = n
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -384,8 +384,8 @@ public ApiResponse< string > EmailHistoryExportGetWithHttpInfo (string filename,
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -462,8 +462,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailHistoryExport
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -539,8 +539,8 @@ public ApiResponse< string > EmailHistoryGetWithHttpInfo (int? dateFrom = null,
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -617,8 +617,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailHistoryGetAsy
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -696,8 +696,8 @@ public ApiResponse< string > EmailPricePostWithHttpInfo (Email body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -776,8 +776,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailPricePostAsyn
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -855,8 +855,8 @@ public ApiResponse< string > EmailSendPostWithHttpInfo (Email body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -935,8 +935,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailSendPostAsync
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/TransferCreditApi.cs b/src/IO.ClickSend/ClickSend.Api/TransferCreditApi.cs
index d940f7f..2d61ad0 100644
--- a/src/IO.ClickSend/ClickSend.Api/TransferCreditApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/TransferCreditApi.cs
@@ -121,7 +121,7 @@ public TransferCreditApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -240,8 +240,8 @@ public ApiResponse< string > ResellerTransferCreditPutWithHttpInfo (ResellerAcco
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -320,8 +320,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> ResellerTransferCr
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/UploadApi.cs b/src/IO.ClickSend/ClickSend.Api/UploadApi.cs
index 3e4843b..8fbb160 100644
--- a/src/IO.ClickSend/ClickSend.Api/UploadApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/UploadApi.cs
@@ -125,7 +125,7 @@ public UploadApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -250,8 +250,8 @@ public ApiResponse< string > UploadsPostWithHttpInfo (UploadFile body, string co
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -336,8 +336,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> UploadsPostAsyncWi
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/UserEmailTemplatesApi.cs b/src/IO.ClickSend/ClickSend.Api/UserEmailTemplatesApi.cs
index 80e557c..a7a0183 100644
--- a/src/IO.ClickSend/ClickSend.Api/UserEmailTemplatesApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/UserEmailTemplatesApi.cs
@@ -297,7 +297,7 @@ public UserEmailTemplatesApi(IO.ClickSend.Client.Configuration configuration = n
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -408,8 +408,8 @@ public ApiResponse< string > EmailTemplateDeleteWithHttpInfo (int? templateId)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -480,8 +480,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailTemplateDelet
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -551,8 +551,8 @@ public ApiResponse< string > EmailTemplateGetWithHttpInfo (int? templateId)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -623,8 +623,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailTemplateGetAs
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -702,8 +702,8 @@ public ApiResponse< string > EmailTemplatePostWithHttpInfo (EmailTemplateNew bod
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -782,8 +782,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailTemplatePostA
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -867,8 +867,8 @@ public ApiResponse< string > EmailTemplatePutWithHttpInfo (EmailTemplateUpdate b
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -953,8 +953,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailTemplatePutAs
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1024,9 +1024,9 @@ public ApiResponse< string > EmailTemplatesGetWithHttpInfo (int? page = null, in
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
+            RestResponse localVarResponse = (RestResponse)this.Configuration.ApiClient.CallApi(localVarPath,
+                      Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                      localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
@@ -1096,8 +1096,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> EmailTemplatesGetA
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/VoiceApi.cs b/src/IO.ClickSend/ClickSend.Api/VoiceApi.cs
index 3ee0dc4..d14a07c 100644
--- a/src/IO.ClickSend/ClickSend.Api/VoiceApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/VoiceApi.cs
@@ -507,7 +507,7 @@ public VoiceApi(IO.ClickSend.Client.Configuration configuration = null)
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -612,8 +612,8 @@ public ApiResponse< string > VoiceCancelAllPutWithHttpInfo ()
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -678,9 +678,9 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoiceCancelAllPutA
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
+            RestResponse localVarResponse = (RestResponse)this.Configuration.ApiClient.CallApi(localVarPath,
+                        Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                        localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
@@ -749,8 +749,8 @@ public ApiResponse< string > VoiceCancelByMessageIdPutWithHttpInfo (string messa
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -821,8 +821,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoiceCancelByMessa
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -892,8 +892,8 @@ public ApiResponse< string > VoiceHistoryExportGetWithHttpInfo (string filename)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -964,8 +964,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoiceHistoryExport
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1041,8 +1041,8 @@ public ApiResponse< string > VoiceHistoryGetWithHttpInfo (int? dateFrom = null,
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1119,8 +1119,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoiceHistoryGetAsy
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1184,8 +1184,8 @@ public ApiResponse< string > VoiceLangGetWithHttpInfo ()
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1250,8 +1250,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoiceLangGetAsyncW
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1329,8 +1329,8 @@ public ApiResponse< string > VoicePricePostWithHttpInfo (VoiceMessageCollection
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1409,8 +1409,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoicePricePostAsyn
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1480,8 +1480,8 @@ public ApiResponse< string > VoiceReceiptsGetWithHttpInfo (int? page = null, int
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1552,8 +1552,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoiceReceiptsGetAs
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1631,8 +1631,8 @@ public ApiResponse< string > VoiceReceiptsPostWithHttpInfo (Url body)
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1711,8 +1711,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoiceReceiptsPostA
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1787,8 +1787,8 @@ public ApiResponse< string > VoiceReceiptsReadPutWithHttpInfo (DateBefore body =
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1864,9 +1864,9 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoiceReceiptsReadP
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
+            RestResponse localVarResponse = (RestResponse)this.Configuration.ApiClient.CallApi(localVarPath,
+                 Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
@@ -1943,8 +1943,8 @@ public ApiResponse< string > VoiceSendPostWithHttpInfo (VoiceMessageCollection b
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -2023,8 +2023,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoiceSendPostAsync
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
diff --git a/src/IO.ClickSend/ClickSend.Api/VoiceDeliveryReceiptRulesApi.cs b/src/IO.ClickSend/ClickSend.Api/VoiceDeliveryReceiptRulesApi.cs
index 8df3a8c..29caae5 100644
--- a/src/IO.ClickSend/ClickSend.Api/VoiceDeliveryReceiptRulesApi.cs
+++ b/src/IO.ClickSend/ClickSend.Api/VoiceDeliveryReceiptRulesApi.cs
@@ -301,7 +301,7 @@ public VoiceDeliveryReceiptRulesApi(IO.ClickSend.Client.Configuration configurat
         /// <value>The base path</value>
         public String GetBasePath()
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+            return this.Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
         }
 
         /// <summary>
@@ -412,8 +412,8 @@ public ApiResponse< string > VoiceDeliveryReceiptAutomationDeleteWithHttpInfo (i
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -484,8 +484,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoiceDeliveryRecei
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Delete, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -555,8 +555,8 @@ public ApiResponse< string > VoiceDeliveryReceiptAutomationGetWithHttpInfo (int?
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -627,8 +627,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoiceDeliveryRecei
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -706,8 +706,8 @@ public ApiResponse< string > VoiceDeliveryReceiptAutomationPostWithHttpInfo (Del
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -786,8 +786,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoiceDeliveryRecei
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -871,8 +871,8 @@ public ApiResponse< string > VoiceDeliveryReceiptAutomationPutWithHttpInfo (Deli
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -957,8 +957,8 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoiceDeliveryRecei
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.Put, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1031,8 +1031,8 @@ public ApiResponse< string > VoiceDeliveryReceiptAutomationsGetWithHttpInfo (str
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            RestResponse localVarResponse = (RestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -1106,9 +1106,9 @@ public async System.Threading.Tasks.Task<ApiResponse<string>> VoiceDeliveryRecei
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
+            RestResponse localVarResponse = (RestResponse)this.Configuration.ApiClient.CallApi(localVarPath,
+                  Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                  localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
diff --git a/src/IO.ClickSend/Client/ApiClient.cs b/src/IO.ClickSend/Client/ApiClient.cs
index 0cd24c1..0a82c36 100644
--- a/src/IO.ClickSend/Client/ApiClient.cs
+++ b/src/IO.ClickSend/Client/ApiClient.cs
@@ -36,14 +36,14 @@ public partial class ApiClient
         /// Allows for extending request processing for <see cref="ApiClient"/> generated code.
         /// </summary>
         /// <param name="request">The RestSharp request object</param>
-        partial void InterceptRequest(IRestRequest request);
+        partial void InterceptRequest(RestRequest request);
 
         /// <summary>
         /// Allows for extending response processing for <see cref="ApiClient"/> generated code.
         /// </summary>
         /// <param name="request">The RestSharp request object</param>
         /// <param name="response">The RestSharp response object</param>
-        partial void InterceptResponse(IRestRequest request, IRestResponse response);
+        partial void InterceptResponse(RestRequest request, RestResponse response);
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ApiClient" /> class
@@ -74,7 +74,7 @@ public ApiClient(Configuration config)
         /// <param name="basePath">The base path.</param>
         public ApiClient(String basePath = "https://rest.clicksend.com/v3")
         {
-           if (String.IsNullOrEmpty(basePath))
+            if (String.IsNullOrEmpty(basePath))
                 throw new ArgumentException("basePath cannot be empty");
 
             RestClient = new RestClient(basePath);
@@ -115,25 +115,25 @@ private RestRequest PrepareRequest(
             var request = new RestRequest(path, method);
 
             // add path parameter, if any
-            foreach(var param in pathParams)
+            foreach (var param in pathParams)
                 request.AddParameter(param.Key, param.Value, ParameterType.UrlSegment);
 
             // add header parameter, if any
-            foreach(var param in headerParams)
+            foreach (var param in headerParams)
                 request.AddHeader(param.Key, param.Value);
 
             // add query parameter, if any
-            foreach(var param in queryParams)
+            foreach (var param in queryParams)
                 request.AddQueryParameter(param.Key, param.Value);
 
             // add form parameter, if any
-            foreach(var param in formParams)
+            foreach (var param in formParams)
                 request.AddParameter(param.Key, param.Value);
 
             // add file parameter, if any
-            foreach(var param in fileParams)
+            foreach (var param in fileParams)
             {
-                request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
+                //request.AddFile((param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
             }
 
             if (postBody != null) // http body (model or byte[]) parameter
@@ -168,16 +168,17 @@ public Object CallApi(
                 pathParams, contentType);
 
             // set timeout
-            
-            RestClient.Timeout = Configuration.Timeout;
+            RestClientOptions options = new RestClientOptions();
+
+            //options.Timeout = new TimeSpan(Configuration.Timeout);
             // set user agent
-            RestClient.UserAgent = Configuration.UserAgent;
+            options.UserAgent = Configuration.UserAgent;
 
             InterceptRequest(request);
             var response = RestClient.Execute(request);
             InterceptResponse(request, response);
 
-            return (Object) response;
+            return (Object)response;
         }
         /// <summary>
         /// Makes the asynchronous HTTP request.
@@ -202,7 +203,7 @@ public async System.Threading.Tasks.Task<Object> CallApiAsync(
                 path, method, queryParams, postBody, headerParams, formParams, fileParams,
                 pathParams, contentType);
             InterceptRequest(request);
-            var response = await RestClient.ExecuteTaskAsync(request);
+            var response = await RestClient.ExecuteAsync(request);
             InterceptResponse(request, response);
             return (Object)response;
         }
@@ -250,13 +251,13 @@ public string ParameterToString(object obj)
                 // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")
                 // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
                 // For example: 2009-06-15T13:45:30.0000000
-                return ((DateTime)obj).ToString (Configuration.DateTimeFormat);
+                return ((DateTime)obj).ToString(Configuration.DateTimeFormat);
             else if (obj is DateTimeOffset)
                 // Return a formatted date string - Can be customized with Configuration.DateTimeFormat
                 // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")
                 // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
                 // For example: 2009-06-15T13:45:30.0000000
-                return ((DateTimeOffset)obj).ToString (Configuration.DateTimeFormat);
+                return ((DateTimeOffset)obj).ToString(Configuration.DateTimeFormat);
             else if (obj is IList)
             {
                 var flattenedString = new StringBuilder();
@@ -269,7 +270,7 @@ public string ParameterToString(object obj)
                 return flattenedString.ToString();
             }
             else
-                return Convert.ToString (obj);
+                return Convert.ToString(obj);
         }
 
         /// <summary>
@@ -278,9 +279,9 @@ public string ParameterToString(object obj)
         /// <param name="response">The HTTP response.</param>
         /// <param name="type">Object type.</param>
         /// <returns>Object representation of the JSON string.</returns>
-        public object Deserialize(IRestResponse response, Type type)
+        public object Deserialize(RestResponse response, Type type)
         {
-            IList<Parameter> headers = response.Headers;
+            List<HeaderParameter> headers = response.Headers.ToList();
             if (type == typeof(byte[])) // return byte array
             {
                 return response.RawBytes;
@@ -312,7 +313,7 @@ public object Deserialize(IRestResponse response, Type type)
 
             if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object
             {
-                return DateTime.Parse(response.Content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
+                return DateTime.Parse(response.Content, null, System.Globalization.DateTimeStyles.RoundtripKind);
             }
 
             if (type == typeof(String) || type.Name.StartsWith("System.Nullable")) // return primitive type
@@ -431,7 +432,7 @@ public static dynamic ConvertType(dynamic fromObject, Type toObject)
         /// <returns>Byte array</returns>
         public static byte[] ReadAsBytes(Stream inputStream)
         {
-            byte[] buf = new byte[16*1024];
+            byte[] buf = new byte[16 * 1024];
             using (MemoryStream ms = new MemoryStream())
             {
                 int count;
diff --git a/src/IO.ClickSend/Client/Configuration.cs b/src/IO.ClickSend/Client/Configuration.cs
index 9c2c14e..12696c9 100644
--- a/src/IO.ClickSend/Client/Configuration.cs
+++ b/src/IO.ClickSend/Client/Configuration.cs
@@ -119,7 +119,7 @@ public Configuration()
             ApiKey = new ConcurrentDictionary<string, string>();
             ApiKeyPrefix = new ConcurrentDictionary<string, string>();
 
-            Timeout = 100000;
+            //Timeout = 100000;
         }
 
         /// <summary>
@@ -225,13 +225,16 @@ public virtual ApiClient ApiClient
         /// <summary>
         /// Gets or sets the base path for API access.
         /// </summary>
-        public virtual string BasePath {
+        public virtual string BasePath
+        {
             get { return _basePath; }
-            set {
+            set
+            {
                 _basePath = value;
                 // pass-through to ApiClient if it's set.
-                if(_apiClient != null) {
-                    _apiClient.RestClient.BaseUrl = new Uri(_basePath);
+                if (_apiClient != null)
+                {
+                    //_apiClient.RestClient.Options.BaseUrl = new Uri(_basePath);
                 }
             }
         }
@@ -245,29 +248,29 @@ public virtual string BasePath {
         /// <summary>
         /// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds.
         /// </summary>
-        public virtual int Timeout
-        {
-            
-            get
-            {
-                if (_apiClient == null)
-                {
-                    return _timeout;
-                } 
-                else
-                {
-                    return ApiClient.RestClient.Timeout;
-                }
-            }
-            set
-            {
-                _timeout = value;
-                if (_apiClient != null)
-                {
-                    ApiClient.RestClient.Timeout = _timeout;
-                }
-            }
-        }
+        //public virtual int Timeout
+        //{
+
+        //    get
+        //    {
+        //        if (_apiClient == null)
+        //        {
+        //            return _timeout;
+        //        }
+        //        else
+        //        {
+        //            return Convert.ToInt32(ApiClient.RestClient.Options.Timeout.Value.TotalMilliseconds);
+        //        }
+        //    }
+        //    set
+        //    {
+        //        _timeout = value;
+        //        if (_apiClient != null)
+        //        {
+        //            ApiClient.RestClient.Options.Timeout = new TimeSpan(_timeout);
+        //        }
+        //    }
+        //}
 
         /// <summary>
         /// Gets or sets the HTTP user agent.
@@ -295,9 +298,9 @@ public virtual int Timeout
         public string GetApiKeyWithPrefix(string apiKeyIdentifier)
         {
             var apiKeyValue = "";
-            ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue);
+            ApiKey.TryGetValue(apiKeyIdentifier, out apiKeyValue);
             var apiKeyPrefix = "";
-            if (ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix))
+            if (ApiKeyPrefix.TryGetValue(apiKeyIdentifier, out apiKeyPrefix))
                 return apiKeyPrefix + " " + apiKeyValue;
             else
                 return apiKeyValue;
@@ -436,7 +439,7 @@ public static String ToDebugReport()
         {
             String report = "C# SDK (IO.ClickSend) Debug Report:\n";
             report += "    OS: " + System.Environment.OSVersion + "\n";
-            report += "    .NET Framework Version: " + System.Environment.Version  + "\n";
+            report += "    .NET Framework Version: " + System.Environment.Version + "\n";
             report += "    Version of the API: 3.1\n";
             report += "    SDK Package Version: 1.0.0\n";
 
diff --git a/src/IO.ClickSend/Client/ExceptionFactory.cs b/src/IO.ClickSend/Client/ExceptionFactory.cs
index 62f5972..7f8a080 100644
--- a/src/IO.ClickSend/Client/ExceptionFactory.cs
+++ b/src/IO.ClickSend/Client/ExceptionFactory.cs
@@ -19,5 +19,5 @@ namespace IO.ClickSend.Client
     /// <param name="methodName">Method name</param>
     /// <param name="response">Response</param>
     /// <returns>Exceptions</returns>
-    public delegate Exception ExceptionFactory(string methodName, IRestResponse response);
+    public delegate Exception ExceptionFactory(string methodName, RestResponse response);
 }
diff --git a/src/IO.ClickSend/Client/IReadableConfiguration.cs b/src/IO.ClickSend/Client/IReadableConfiguration.cs
index acf53d8..b2dcd9b 100644
--- a/src/IO.ClickSend/Client/IReadableConfiguration.cs
+++ b/src/IO.ClickSend/Client/IReadableConfiguration.cs
@@ -63,7 +63,7 @@ public interface IReadableConfiguration
         /// Gets the HTTP connection timeout (in milliseconds)
         /// </summary>
         /// <value>HTTP connection timeout.</value>
-        int Timeout { get; }
+        //int Timeout { get; }
 
         /// <summary>
         /// Gets the user agent.
diff --git a/src/IO.ClickSend/IO.ClickSend.csproj b/src/IO.ClickSend/IO.ClickSend.csproj
index 41d9f5e..c6c9f6e 100644
--- a/src/IO.ClickSend/IO.ClickSend.csproj
+++ b/src/IO.ClickSend/IO.ClickSend.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 ClickSend v3 API
 
@@ -21,10 +21,11 @@ Contact: support@clicksend.com
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>IO.ClickSend</RootNamespace>
     <AssemblyName>IO.ClickSend</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <PackageOutputPath>bin\Package</PackageOutputPath>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,8 +44,47 @@ Contact: support@clicksend.com
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="JsonSubTypes, Version=2.0.1.0, Culture=neutral, PublicKeyToken=ee75fc290dbc1176, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\JsonSubTypes.2.0.1\lib\net45\JsonSubTypes.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="RestSharp, Version=112.1.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\RestSharp.112.1.0\lib\net471\RestSharp.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=8.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -52,24 +92,6 @@ Contact: support@clicksend.com
     <Reference Include="System.Data" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="JsonSubTypes">
-      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-      <HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-      <HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-    </Reference>
-    <Reference Include="RestSharp">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-    </Reference>
     <Reference Include="NuGet.Frameworks">
       <HintPath>..\..\packages\NuGet.Frameworks.5.3.1\lib\net40\NuGet.Frameworks.dll</HintPath>
     </Reference>
@@ -78,8 +100,8 @@ Contact: support@clicksend.com
     <Compile Include="**\*.cs" Exclude="obj\**" />
   </ItemGroup>
   <ItemGroup>
-      <None Include="packages.config" />
+    <None Include="app.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
-
+</Project>
\ No newline at end of file
diff --git a/src/IO.ClickSend/app.config b/src/IO.ClickSend/app.config
new file mode 100644
index 0000000..97cb42c
--- /dev/null
+++ b/src/IO.ClickSend/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>
diff --git a/src/IO.ClickSend/packages.config b/src/IO.ClickSend/packages.config
index 3caf34e..868bf8b 100644
--- a/src/IO.ClickSend/packages.config
+++ b/src/IO.ClickSend/packages.config
@@ -1,6 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" developmentDependency="true" />
-  <package id="JsonSubTypes" version="1.2.0" targetFramework="net45" developmentDependency="true" />
-</packages>
+  <package id="JsonSubTypes" version="2.0.1" targetFramework="net45" developmentDependency="true" requireReinstallation="true" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net45" developmentDependency="true" />
+  <package id="RestSharp" version="112.1.0" targetFramework="net472" developmentDependency="true" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
+  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net472" />
+  <package id="System.Text.Json" version="8.0.4" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
+</packages>
\ No newline at end of file