From ff05085e2e2bf9511d8ff9e088c75da79bfb00ef Mon Sep 17 00:00:00 2001
From: dpse <mail@dpse.net>
Date: Mon, 6 Jul 2020 23:09:00 +0200
Subject: [PATCH] Add ConfigureAwait(false) to all awaits in order to avoid
 capturing context and causing potential deadlocks. Fixes #94.

---
 .../Connectors/AbsenceTransactionConnector.cs | 10 +++---
 .../Connectors/AccountChartConnector.cs       |  2 +-
 .../Connectors/AccountConnector.cs            | 10 +++---
 .../Connectors/ArchiveConnector.cs            | 30 ++++++++---------
 .../Connectors/ArticleConnector.cs            | 10 +++---
 .../ArticleFileConnectionConnector.cs         |  8 ++---
 .../Connectors/AssetConnector.cs              | 10 +++---
 .../AssetFileConnectionConnector.cs           |  8 ++---
 .../Connectors/AssetTypesConnector.cs         | 10 +++---
 .../AttendanceTransactionsConnector.cs        | 10 +++---
 .../Connectors/CompanyInformationConnector.cs |  2 +-
 .../Connectors/CompanySettingsConnector.cs    |  2 +-
 .../Connectors/ContractAccrualConnector.cs    | 10 +++---
 .../Connectors/ContractConnector.cs           |  8 ++---
 .../Connectors/ContractTemplateConnector.cs   |  8 ++---
 .../Connectors/CostCenterConnector.cs         | 10 +++---
 .../Connectors/CurrencyConnector.cs           | 10 +++---
 .../Connectors/CustomerConnector.cs           | 10 +++---
 .../Connectors/EmployeeConnector.cs           |  8 ++---
 .../Connectors/ExpenseConnector.cs            |  6 ++--
 .../Connectors/FinancialYearConnector.cs      |  6 ++--
 .../Connectors/InvoiceAccrualConnector.cs     | 10 +++---
 .../Connectors/InvoiceConnector.cs            |  8 ++---
 .../InvoiceFileConnectionConnector.cs         |  8 ++---
 .../Connectors/InvoicePaymentConnector.cs     | 10 +++---
 .../Connectors/LabelConnector.cs              |  8 ++---
 .../Connectors/LockedPeriodConnector.cs       |  2 +-
 .../Connectors/ModeOfPaymentConnector.cs      | 10 +++---
 .../Connectors/OfferConnector.cs              |  8 ++---
 .../Connectors/OrderConnector.cs              |  8 ++---
 .../Connectors/PredefinedAccountsConnector.cs |  6 ++--
 .../PredefinedVoucherSeriesConnector.cs       |  6 ++--
 .../Connectors/PriceConnector.cs              | 10 +++---
 .../Connectors/PriceListConnector.cs          |  8 ++---
 .../Connectors/PrintTemplateConnector.cs      |  2 +-
 .../Connectors/ProjectConnector.cs            | 10 +++---
 FortnoxAPILibrary/Connectors/SIEConnector.cs  |  2 +-
 .../Connectors/SalaryTransactionConnector.cs  | 10 +++---
 .../Connectors/ScheduleTimesConnector.cs      |  8 ++---
 .../Connectors/SupplierConnector.cs           | 10 +++---
 .../SupplierInvoiceAccrualConnector.cs        | 10 +++---
 .../Connectors/SupplierInvoiceConnector.cs    |  8 ++---
 ...erInvoiceExternalURLConnectionConnector.cs | 10 +++---
 .../SupplierInvoiceFileConnectionConnector.cs |  8 ++---
 .../SupplierInvoicePaymentConnector.cs        | 10 +++---
 .../Connectors/TaxReductionConnector.cs       | 10 +++---
 .../Connectors/TermsOfDeliveryConnector.cs    | 10 +++---
 .../Connectors/TermsOfPaymentConnector.cs     | 10 +++---
 .../TrustedEmailDomainsConnector.cs           |  8 ++---
 .../TrustedEmailSendersConnector.cs           |  6 ++--
 FortnoxAPILibrary/Connectors/UnitConnector.cs | 10 +++---
 .../Connectors/VoucherConnector.cs            |  6 ++--
 .../VoucherFileConnectionConnector.cs         |  8 ++---
 .../Connectors/VoucherSeriesConnector.cs      |  8 ++---
 .../Connectors/WayOfDeliveryConnector.cs      | 10 +++---
 FortnoxAPILibrary/EntityConnector.cs          | 16 +++++-----
 FortnoxAPILibrary/Extensions.cs               | 16 +++++-----
 FortnoxAPILibrary/UrlRequestBase.cs           | 32 +++++++++----------
 58 files changed, 264 insertions(+), 264 deletions(-)

diff --git a/FortnoxAPILibrary/Connectors/AbsenceTransactionConnector.cs b/FortnoxAPILibrary/Connectors/AbsenceTransactionConnector.cs
index b996b5c5..6a4bbf64 100644
--- a/FortnoxAPILibrary/Connectors/AbsenceTransactionConnector.cs
+++ b/FortnoxAPILibrary/Connectors/AbsenceTransactionConnector.cs
@@ -83,23 +83,23 @@ public EntityCollection<AbsenceTransaction> Find()
 
 		public async Task<EntityCollection<AbsenceTransaction>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string employeeId, DateTime? date, AbsenceCauseCode? code)
 		{
-			await BaseDelete(employeeId, date?.ToString(APIConstants.DateFormat), code?.GetStringValue());
+			await BaseDelete(employeeId, date?.ToString(APIConstants.DateFormat), code?.GetStringValue()).ConfigureAwait(false);
 		}
 		public async Task<AbsenceTransaction> CreateAsync(AbsenceTransaction absenceTransaction)
 		{
-			return await BaseCreate(absenceTransaction);
+			return await BaseCreate(absenceTransaction).ConfigureAwait(false);
 		}
 		public async Task<AbsenceTransaction> UpdateAsync(AbsenceTransaction absenceTransaction)
 		{
-			return await BaseUpdate(absenceTransaction, absenceTransaction.EmployeeId, absenceTransaction.Date?.ToString(APIConstants.DateFormat), absenceTransaction.CauseCode?.GetStringValue());
+			return await BaseUpdate(absenceTransaction, absenceTransaction.EmployeeId, absenceTransaction.Date?.ToString(APIConstants.DateFormat), absenceTransaction.CauseCode?.GetStringValue()).ConfigureAwait(false);
 		}
         public async Task<AbsenceTransaction> GetAsync(string employeeId, DateTime? date, AbsenceCauseCode? code)
 		{
-			return await BaseGet(employeeId, date?.ToString(APIConstants.DateFormat), code?.GetStringValue());
+			return await BaseGet(employeeId, date?.ToString(APIConstants.DateFormat), code?.GetStringValue()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/AccountChartConnector.cs b/FortnoxAPILibrary/Connectors/AccountChartConnector.cs
index ec7ade6f..acbdfa00 100644
--- a/FortnoxAPILibrary/Connectors/AccountChartConnector.cs
+++ b/FortnoxAPILibrary/Connectors/AccountChartConnector.cs
@@ -32,7 +32,7 @@ public EntityCollection<AccountChart> Find()
 
 		public async Task<EntityCollection<AccountChart>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/AccountConnector.cs b/FortnoxAPILibrary/Connectors/AccountConnector.cs
index 8c7a756e..07a82ef1 100644
--- a/FortnoxAPILibrary/Connectors/AccountConnector.cs
+++ b/FortnoxAPILibrary/Connectors/AccountConnector.cs
@@ -77,23 +77,23 @@ public EntityCollection<AccountSubset> Find()
 
 		public async Task<EntityCollection<AccountSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(int? id)
 		{
-			await BaseDelete(id.ToString());
+			await BaseDelete(id.ToString()).ConfigureAwait(false);
 		}
 		public async Task<Account> CreateAsync(Account account)
 		{
-			return await BaseCreate(account);
+			return await BaseCreate(account).ConfigureAwait(false);
 		}
 		public async Task<Account> UpdateAsync(Account account)
 		{
-			return await BaseUpdate(account, account.Number.ToString());
+			return await BaseUpdate(account, account.Number.ToString()).ConfigureAwait(false);
 		}
 		public async Task<Account> GetAsync(int? id)
 		{
-			return await BaseGet(id.ToString());
+			return await BaseGet(id.ToString()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/ArchiveConnector.cs b/FortnoxAPILibrary/Connectors/ArchiveConnector.cs
index c829cbda..b7e3c9dc 100644
--- a/FortnoxAPILibrary/Connectors/ArchiveConnector.cs
+++ b/FortnoxAPILibrary/Connectors/ArchiveConnector.cs
@@ -124,13 +124,13 @@ public void DeleteFolder(string pathOrId)
 
         public async Task<byte[]> DownloadFileAsync(string id)
         {
-            return await BaseDownload(null, id);
+            return await BaseDownload(null, id).ConfigureAwait(false);
         }
 
         public async Task<FileInfo> DownloadFileAsync(string id, string localPath)
         {
-            var data = await DownloadFileAsync(id);
-            return await data.ToFile(localPath);
+            var data = await DownloadFileAsync(id).ConfigureAwait(false);
+            return await data.ToFile(localPath).ConfigureAwait(false);
         }
 
         public async Task<ArchiveFile> UploadFileAsync(string name, byte[] data, string folderPathOrId = null)
@@ -154,23 +154,23 @@ public async Task<ArchiveFile> UploadFileAsync(string name, byte[] data, string
             else
                 urlParams.Add("path", folderPathOrId);
 
-            return await BaseUpload(name, data, urlParams);
+            return await BaseUpload(name, data, urlParams).ConfigureAwait(false);
         }
 
         public async Task<ArchiveFile> UploadFileAsync(string name, Stream stream, string folderPathOrId = null)
         {
-            return await UploadFileAsync(name, await stream.ToBytes(), folderPathOrId);
+            return await UploadFileAsync(name, await stream.ToBytes(), folderPathOrId).ConfigureAwait(false);
         }
 
         public async Task<ArchiveFile> UploadFileAsync(string localPath, string folderPathOrId = null)
         {
             var fileInfo = new FileInfo(localPath);
-            return await UploadFileAsync(fileInfo.Name, fileInfo.ToBytes().Result, folderPathOrId);
+            return await UploadFileAsync(fileInfo.Name, fileInfo.ToBytes().Result, folderPathOrId).ConfigureAwait(false);
         }
 
         public async Task DeleteFileAsync(string id)
         {
-            await BaseDelete(id);
+            await BaseDelete(id).ConfigureAwait(false);
         }
 
         public async Task<ArchiveFolder> GetFolderAsync(string pathOrId = null)
@@ -179,18 +179,18 @@ public async Task<ArchiveFolder> GetFolderAsync(string pathOrId = null)
                 pathOrId = "root";
 
             if (IsArchiveId(pathOrId) || IsPredefinedFolder(pathOrId))
-                return await BaseGet(pathOrId);
+                return await BaseGet(pathOrId).ConfigureAwait(false);
             else
             {
                 ParametersInjection = new Dictionary<string, string>();
                 ParametersInjection.Add("path", pathOrId);
-                return await BaseGet();
+                return await BaseGet().ConfigureAwait(false);
             }
         }
 
         public async Task<ArchiveFolder> GetRootAsync()
         {
-            return await GetFolderAsync();
+            return await GetFolderAsync().ConfigureAwait(false);
         }
 
         public async Task<ArchiveFolder> CreateFolderAsync(string folderName, string path = null)
@@ -200,17 +200,17 @@ public async Task<ArchiveFolder> CreateFolderAsync(string folderName, string pat
             if (path != null)
                 ParametersInjection = new Dictionary<string, string> { { "path", path } };
 
-            return await BaseCreate(folder);
+            return await BaseCreate(folder).ConfigureAwait(false);
         }
 
         public async Task DeleteFolderAsync(string pathOrId)
         {
             if (IsArchiveId(pathOrId))
-                await BaseDelete(pathOrId);
+                await BaseDelete(pathOrId).ConfigureAwait(false);
             else
             {
                 ParametersInjection = new Dictionary<string, string> { { "path", pathOrId } };
-                await BaseDelete();
+                await BaseDelete().ConfigureAwait(false);
             }
         }
 
@@ -226,7 +226,7 @@ private async Task<ArchiveFile> BaseUpload(string name, byte[] data, Dictionary<
                 Indices = indices
             };
 
-            return await UploadFile<ArchiveFile>(data, name);
+            return await UploadFile<ArchiveFile>(data, name).ConfigureAwait(false);
         }
 
         private async Task<byte[]> BaseDownload(Dictionary<string, string> parameters, params string[] indices)
@@ -239,7 +239,7 @@ private async Task<byte[]> BaseDownload(Dictionary<string, string> parameters, p
                 Indices = indices
             };
 
-            return await DownloadFile();
+            return await DownloadFile().ConfigureAwait(false);
         }
 
         private static bool IsArchiveId(string str)
diff --git a/FortnoxAPILibrary/Connectors/ArticleConnector.cs b/FortnoxAPILibrary/Connectors/ArticleConnector.cs
index 69fa1080..f361016d 100644
--- a/FortnoxAPILibrary/Connectors/ArticleConnector.cs
+++ b/FortnoxAPILibrary/Connectors/ArticleConnector.cs
@@ -106,23 +106,23 @@ public EntityCollection<ArticleSubset> Find()
 
 		public async Task<EntityCollection<ArticleSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<Article> CreateAsync(Article article)
 		{
-			return await BaseCreate(article);
+			return await BaseCreate(article).ConfigureAwait(false);
 		}
 		public async Task<Article> UpdateAsync(Article article)
 		{
-			return await BaseUpdate(article, article.ArticleNumber);
+			return await BaseUpdate(article, article.ArticleNumber).ConfigureAwait(false);
 		}
 		public async Task<Article> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/ArticleFileConnectionConnector.cs b/FortnoxAPILibrary/Connectors/ArticleFileConnectionConnector.cs
index 6d08efbd..6e8d0109 100644
--- a/FortnoxAPILibrary/Connectors/ArticleFileConnectionConnector.cs
+++ b/FortnoxAPILibrary/Connectors/ArticleFileConnectionConnector.cs
@@ -68,19 +68,19 @@ public EntityCollection<ArticleFileConnection> Find()
 
 		public async Task<EntityCollection<ArticleFileConnection>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<ArticleFileConnection> CreateAsync(ArticleFileConnection articleFileConnection)
 		{
-			return await BaseCreate(articleFileConnection);
+			return await BaseCreate(articleFileConnection).ConfigureAwait(false);
 		}
 		public async Task<ArticleFileConnection> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/AssetConnector.cs b/FortnoxAPILibrary/Connectors/AssetConnector.cs
index 0a44a34c..f394bcbf 100644
--- a/FortnoxAPILibrary/Connectors/AssetConnector.cs
+++ b/FortnoxAPILibrary/Connectors/AssetConnector.cs
@@ -84,17 +84,17 @@ public EntityCollection<AssetSubset> Find()
 
 		public async Task<EntityCollection<AssetSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<Asset> CreateAsync(Asset asset)
         {
             FixResponseContent = (json) => new Regex("Assets").Replace(json, "Asset", 1);
 
-            var result = await BaseCreate(asset);
+            var result = await BaseCreate(asset).ConfigureAwait(false);
 
             FixResponseContent = null;
             return result;
@@ -105,7 +105,7 @@ public async Task<Asset> UpdateAsync(Asset asset)
             asset.Id = null;
             FixResponseContent = (json) => new Regex("Assets").Replace(json, "Asset", 1);
 
-            var result = await BaseUpdate(asset, id);
+            var result = await BaseUpdate(asset, id).ConfigureAwait(false);
 
             FixResponseContent = null;
             asset.Id = id;
@@ -116,7 +116,7 @@ public async Task<Asset> GetAsync(string id)
 		{
             FixResponseContent = (json) => new Regex("Assets").Replace(json, "Asset", 1);
 
-            var result = await BaseGet(id);
+            var result = await BaseGet(id).ConfigureAwait(false);
 
             FixResponseContent = null;
             return result;
diff --git a/FortnoxAPILibrary/Connectors/AssetFileConnectionConnector.cs b/FortnoxAPILibrary/Connectors/AssetFileConnectionConnector.cs
index c7252987..c1312d48 100644
--- a/FortnoxAPILibrary/Connectors/AssetFileConnectionConnector.cs
+++ b/FortnoxAPILibrary/Connectors/AssetFileConnectionConnector.cs
@@ -67,19 +67,19 @@ public EntityCollection<AssetFileConnection> Find()
 
 		public async Task<EntityCollection<AssetFileConnection>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<AssetFileConnection> CreateAsync(AssetFileConnection assetFileConnection)
 		{
-			return await BaseCreate(assetFileConnection);
+			return await BaseCreate(assetFileConnection).ConfigureAwait(false);
 		}
 		public async Task<AssetFileConnection> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/AssetTypesConnector.cs b/FortnoxAPILibrary/Connectors/AssetTypesConnector.cs
index a20fee9f..341a9357 100644
--- a/FortnoxAPILibrary/Connectors/AssetTypesConnector.cs
+++ b/FortnoxAPILibrary/Connectors/AssetTypesConnector.cs
@@ -84,20 +84,20 @@ public async Task<EntityCollection<AssetTypesSubset>> FindAsync()
                 return fixedJson;
             };
 
-            var result = await BaseFind();
+            var result = await BaseFind().ConfigureAwait(false);
 
             FixResponseContent = null;
 			return result;
         }
 		public async Task DeleteAsync(int? id)
 		{
-			await BaseDelete(id.ToString());
+			await BaseDelete(id.ToString()).ConfigureAwait(false);
 		}
 		public async Task<AssetType> CreateAsync(AssetType assetType)
 		{
             FixResponseContent = (json) => new Regex("Type").Replace(json, "AssetType", 1);
 
-            var result = await BaseCreate(assetType);
+            var result = await BaseCreate(assetType).ConfigureAwait(false);
 
             FixResponseContent = null;
             return result;
@@ -106,7 +106,7 @@ public async Task<AssetType> UpdateAsync(AssetType assetTypes)
 		{
 			FixResponseContent = (json) => new Regex("Type").Replace(json, "AssetType", 1);
 
-			var result = await BaseUpdate(assetTypes, assetTypes.Id.ToString());
+			var result = await BaseUpdate(assetTypes, assetTypes.Id.ToString()).ConfigureAwait(false);
 
 			FixResponseContent = null;
             return result;
@@ -115,7 +115,7 @@ public async Task<AssetType> GetAsync(int? id)
 		{
 			FixResponseContent = (json) => new Regex("Type").Replace(json, "AssetType", 1);
 
-			var result = await BaseGet(id.ToString());
+			var result = await BaseGet(id.ToString()).ConfigureAwait(false);
 
             FixResponseContent = null;
             return result;
diff --git a/FortnoxAPILibrary/Connectors/AttendanceTransactionsConnector.cs b/FortnoxAPILibrary/Connectors/AttendanceTransactionsConnector.cs
index 9a559ff3..a740a1fa 100644
--- a/FortnoxAPILibrary/Connectors/AttendanceTransactionsConnector.cs
+++ b/FortnoxAPILibrary/Connectors/AttendanceTransactionsConnector.cs
@@ -82,23 +82,23 @@ public EntityCollection<AttendanceTransactionSubset> Find()
 
         public async Task<EntityCollection<AttendanceTransactionSubset>> FindAsync()
         {
-            return await BaseFind();
+            return await BaseFind().ConfigureAwait(false);
         }
         public async Task DeleteAsync(string employeeId, DateTime? date, AttendanceCauseCode? code)
         {
-            await BaseDelete(employeeId, date?.ToString(APIConstants.DateFormat), code?.GetStringValue());
+            await BaseDelete(employeeId, date?.ToString(APIConstants.DateFormat), code?.GetStringValue()).ConfigureAwait(false);
         }
         public async Task<AttendanceTransaction> CreateAsync(AttendanceTransaction attendanceTransaction)
         {
-            return await BaseCreate(attendanceTransaction);
+            return await BaseCreate(attendanceTransaction).ConfigureAwait(false);
         }
         public async Task<AttendanceTransaction> UpdateAsync(AttendanceTransaction attendanceTransaction)
         {
-            return await BaseUpdate(attendanceTransaction, attendanceTransaction.EmployeeId, attendanceTransaction.Date?.ToString(APIConstants.DateFormat), attendanceTransaction.CauseCode?.GetStringValue());
+            return await BaseUpdate(attendanceTransaction, attendanceTransaction.EmployeeId, attendanceTransaction.Date?.ToString(APIConstants.DateFormat), attendanceTransaction.CauseCode?.GetStringValue()).ConfigureAwait(false);
         }
         public async Task<AttendanceTransaction> GetAsync(string employeeId, DateTime? date, AttendanceCauseCode? code)
         {
-            return await BaseGet(employeeId, date?.ToString(APIConstants.DateFormat), code?.GetStringValue());
+            return await BaseGet(employeeId, date?.ToString(APIConstants.DateFormat), code?.GetStringValue()).ConfigureAwait(false);
         }
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/CompanyInformationConnector.cs b/FortnoxAPILibrary/Connectors/CompanyInformationConnector.cs
index 2f028ad6..d14fb78d 100644
--- a/FortnoxAPILibrary/Connectors/CompanyInformationConnector.cs
+++ b/FortnoxAPILibrary/Connectors/CompanyInformationConnector.cs
@@ -26,7 +26,7 @@ public CompanyInformation Get()
 
 		public async Task<CompanyInformation> GetAsync()
         {
-            return (await BaseFind())?.Entity;
+            return (await BaseFind().ConfigureAwait(false))?.Entity;
         }
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/CompanySettingsConnector.cs b/FortnoxAPILibrary/Connectors/CompanySettingsConnector.cs
index e884bc49..e090c848 100644
--- a/FortnoxAPILibrary/Connectors/CompanySettingsConnector.cs
+++ b/FortnoxAPILibrary/Connectors/CompanySettingsConnector.cs
@@ -26,7 +26,7 @@ public CompanySettings Get()
 
         public async Task<CompanySettings> GetAsync()
         {
-            return (await BaseFind())?.Entity;
+            return (await BaseFind().ConfigureAwait(false))?.Entity;
         }
     }
 }
diff --git a/FortnoxAPILibrary/Connectors/ContractAccrualConnector.cs b/FortnoxAPILibrary/Connectors/ContractAccrualConnector.cs
index 5522c395..466e3c43 100644
--- a/FortnoxAPILibrary/Connectors/ContractAccrualConnector.cs
+++ b/FortnoxAPILibrary/Connectors/ContractAccrualConnector.cs
@@ -71,23 +71,23 @@ public EntityCollection<ContractAccrualSubset> Find()
 
 		public async Task<EntityCollection<ContractAccrualSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(int? id)
 		{
-			await BaseDelete(id.ToString());
+			await BaseDelete(id.ToString()).ConfigureAwait(false);
 		}
 		public async Task<ContractAccrual> CreateAsync(ContractAccrual contractAccrual)
 		{
-			return await BaseCreate(contractAccrual);
+			return await BaseCreate(contractAccrual).ConfigureAwait(false);
 		}
 		public async Task<ContractAccrual> UpdateAsync(ContractAccrual contractAccrual)
 		{
-			return await BaseUpdate(contractAccrual, contractAccrual.DocumentNumber.ToString());
+			return await BaseUpdate(contractAccrual, contractAccrual.DocumentNumber.ToString()).ConfigureAwait(false);
 		}
 		public async Task<ContractAccrual> GetAsync(int? id)
 		{
-			return await BaseGet(id.ToString());
+			return await BaseGet(id.ToString()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/ContractConnector.cs b/FortnoxAPILibrary/Connectors/ContractConnector.cs
index 691eaded..6199e455 100644
--- a/FortnoxAPILibrary/Connectors/ContractConnector.cs
+++ b/FortnoxAPILibrary/Connectors/ContractConnector.cs
@@ -129,19 +129,19 @@ public Contract IncreaseInvoiceCount(int? id)
 
 		public async Task<EntityCollection<ContractSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task<Contract> CreateAsync(Contract contract)
 		{
-			return await BaseCreate(contract);
+			return await BaseCreate(contract).ConfigureAwait(false);
 		}
 		public async Task<Contract> UpdateAsync(Contract contract)
 		{
-			return await BaseUpdate(contract, contract.DocumentNumber.ToString());
+			return await BaseUpdate(contract, contract.DocumentNumber.ToString()).ConfigureAwait(false);
 		}
 		public async Task<Contract> GetAsync(int? id)
 		{
-			return await BaseGet(id.ToString());
+			return await BaseGet(id.ToString()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/ContractTemplateConnector.cs b/FortnoxAPILibrary/Connectors/ContractTemplateConnector.cs
index f3ad9ad3..6cd9b985 100644
--- a/FortnoxAPILibrary/Connectors/ContractTemplateConnector.cs
+++ b/FortnoxAPILibrary/Connectors/ContractTemplateConnector.cs
@@ -62,19 +62,19 @@ public EntityCollection<ContractTemplateSubset> Find()
 
 		public async Task<EntityCollection<ContractTemplateSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task<ContractTemplate> CreateAsync(ContractTemplate contractTemplate)
 		{
-			return await BaseCreate(contractTemplate);
+			return await BaseCreate(contractTemplate).ConfigureAwait(false);
 		}
 		public async Task<ContractTemplate> UpdateAsync(ContractTemplate contractTemplate)
 		{
-			return await BaseUpdate(contractTemplate, contractTemplate.TemplateNumber);
+			return await BaseUpdate(contractTemplate, contractTemplate.TemplateNumber).ConfigureAwait(false);
 		}
 		public async Task<ContractTemplate> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/CostCenterConnector.cs b/FortnoxAPILibrary/Connectors/CostCenterConnector.cs
index 90ea4c79..bdf48c72 100644
--- a/FortnoxAPILibrary/Connectors/CostCenterConnector.cs
+++ b/FortnoxAPILibrary/Connectors/CostCenterConnector.cs
@@ -71,23 +71,23 @@ public EntityCollection<CostCenter> Find()
 
 		public async Task<EntityCollection<CostCenter>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<CostCenter> CreateAsync(CostCenter costCenter)
 		{
-			return await BaseCreate(costCenter);
+			return await BaseCreate(costCenter).ConfigureAwait(false);
 		}
 		public async Task<CostCenter> UpdateAsync(CostCenter costCenter)
 		{
-			return await BaseUpdate(costCenter, costCenter.Code);
+			return await BaseUpdate(costCenter, costCenter.Code).ConfigureAwait(false);
 		}
 		public async Task<CostCenter> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/CurrencyConnector.cs b/FortnoxAPILibrary/Connectors/CurrencyConnector.cs
index 91685b79..1e2aff2d 100644
--- a/FortnoxAPILibrary/Connectors/CurrencyConnector.cs
+++ b/FortnoxAPILibrary/Connectors/CurrencyConnector.cs
@@ -71,23 +71,23 @@ public EntityCollection<Currency> Find()
 
 		public async Task<EntityCollection<Currency>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<Currency> CreateAsync(Currency currency)
 		{
-			return await BaseCreate(currency);
+			return await BaseCreate(currency).ConfigureAwait(false);
 		}
 		public async Task<Currency> UpdateAsync(Currency currency)
 		{
-			return await BaseUpdate(currency, currency.Code);
+			return await BaseUpdate(currency, currency.Code).ConfigureAwait(false);
 		}
 		public async Task<Currency> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/CustomerConnector.cs b/FortnoxAPILibrary/Connectors/CustomerConnector.cs
index eebe4d63..7a9aaa6c 100644
--- a/FortnoxAPILibrary/Connectors/CustomerConnector.cs
+++ b/FortnoxAPILibrary/Connectors/CustomerConnector.cs
@@ -125,23 +125,23 @@ public EntityCollection<CustomerSubset> Find()
 
 		public async Task<EntityCollection<CustomerSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<Customer> CreateAsync(Customer customer)
 		{
-			return await BaseCreate(customer);
+			return await BaseCreate(customer).ConfigureAwait(false);
 		}
 		public async Task<Customer> UpdateAsync(Customer customer)
 		{
-			return await BaseUpdate(customer, customer.CustomerNumber);
+			return await BaseUpdate(customer, customer.CustomerNumber).ConfigureAwait(false);
 		}
 		public async Task<Customer> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/EmployeeConnector.cs b/FortnoxAPILibrary/Connectors/EmployeeConnector.cs
index c26e3793..1751de66 100644
--- a/FortnoxAPILibrary/Connectors/EmployeeConnector.cs
+++ b/FortnoxAPILibrary/Connectors/EmployeeConnector.cs
@@ -62,19 +62,19 @@ public EntityCollection<EmployeeSubset> Find()
 
 		public async Task<EntityCollection<EmployeeSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task<Employee> CreateAsync(Employee employee)
 		{
-			return await BaseCreate(employee);
+			return await BaseCreate(employee).ConfigureAwait(false);
 		}
 		public async Task<Employee> UpdateAsync(Employee employee)
 		{
-			return await BaseUpdate(employee, employee.EmployeeId);
+			return await BaseUpdate(employee, employee.EmployeeId).ConfigureAwait(false);
 		}
 		public async Task<Employee> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/ExpenseConnector.cs b/FortnoxAPILibrary/Connectors/ExpenseConnector.cs
index d1ccefc8..f3ce0aa6 100644
--- a/FortnoxAPILibrary/Connectors/ExpenseConnector.cs
+++ b/FortnoxAPILibrary/Connectors/ExpenseConnector.cs
@@ -52,15 +52,15 @@ public EntityCollection<ExpenseSubset> Find()
 
 		public async Task<EntityCollection<ExpenseSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task<Expense> CreateAsync(Expense expense)
 		{
-			return await BaseCreate(expense);
+			return await BaseCreate(expense).ConfigureAwait(false);
 		}
 		public async Task<Expense> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/FinancialYearConnector.cs b/FortnoxAPILibrary/Connectors/FinancialYearConnector.cs
index 9d9f6650..883819d6 100644
--- a/FortnoxAPILibrary/Connectors/FinancialYearConnector.cs
+++ b/FortnoxAPILibrary/Connectors/FinancialYearConnector.cs
@@ -57,15 +57,15 @@ public EntityCollection<FinancialYearSubset> Find()
 
 		public async Task<EntityCollection<FinancialYearSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task<FinancialYear> CreateAsync(FinancialYear financialYear)
 		{
-			return await BaseCreate(financialYear);
+			return await BaseCreate(financialYear).ConfigureAwait(false);
 		}
 		public async Task<FinancialYear> GetAsync(int? id)
 		{
-			return await BaseGet(id.ToString());
+			return await BaseGet(id.ToString()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/InvoiceAccrualConnector.cs b/FortnoxAPILibrary/Connectors/InvoiceAccrualConnector.cs
index 9bfa29c6..773aeeb4 100644
--- a/FortnoxAPILibrary/Connectors/InvoiceAccrualConnector.cs
+++ b/FortnoxAPILibrary/Connectors/InvoiceAccrualConnector.cs
@@ -72,23 +72,23 @@ public EntityCollection<InvoiceAccrualSubset> Find()
 
         public async Task<EntityCollection<InvoiceAccrualSubset>> FindAsync()
         {
-            return await BaseFind();
+            return await BaseFind().ConfigureAwait(false);
         }
         public async Task DeleteAsync(int? id)
         {
-            await BaseDelete(id.ToString());
+            await BaseDelete(id.ToString()).ConfigureAwait(false);
         }
         public async Task<InvoiceAccrual> CreateAsync(InvoiceAccrual invoiceAccrual)
         {
-            return await BaseCreate(invoiceAccrual);
+            return await BaseCreate(invoiceAccrual).ConfigureAwait(false);
         }
         public async Task<InvoiceAccrual> UpdateAsync(InvoiceAccrual invoiceAccrual)
         {
-            return await BaseUpdate(invoiceAccrual, invoiceAccrual.InvoiceNumber.ToString());
+            return await BaseUpdate(invoiceAccrual, invoiceAccrual.InvoiceNumber.ToString()).ConfigureAwait(false);
         }
         public async Task<InvoiceAccrual> GetAsync(int? id)
         {
-            return await BaseGet(id.ToString());
+            return await BaseGet(id.ToString()).ConfigureAwait(false);
         }
     }
 }
diff --git a/FortnoxAPILibrary/Connectors/InvoiceConnector.cs b/FortnoxAPILibrary/Connectors/InvoiceConnector.cs
index 919c4101..3d0e1db3 100644
--- a/FortnoxAPILibrary/Connectors/InvoiceConnector.cs
+++ b/FortnoxAPILibrary/Connectors/InvoiceConnector.cs
@@ -249,19 +249,19 @@ public byte[] Preview(int? id)
 
 		public async Task<EntityCollection<InvoiceSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task<Invoice> CreateAsync(Invoice invoice)
 		{
-			return await BaseCreate(invoice);
+			return await BaseCreate(invoice).ConfigureAwait(false);
 		}
 		public async Task<Invoice> UpdateAsync(Invoice invoice)
 		{
-			return await BaseUpdate(invoice, invoice.DocumentNumber.ToString());
+			return await BaseUpdate(invoice, invoice.DocumentNumber.ToString()).ConfigureAwait(false);
 		}
 		public async Task<Invoice> GetAsync(int? id)
 		{
-			return await BaseGet(id.ToString());
+			return await BaseGet(id.ToString()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/InvoiceFileConnectionConnector.cs b/FortnoxAPILibrary/Connectors/InvoiceFileConnectionConnector.cs
index 0cb48fe8..088645a1 100644
--- a/FortnoxAPILibrary/Connectors/InvoiceFileConnectionConnector.cs
+++ b/FortnoxAPILibrary/Connectors/InvoiceFileConnectionConnector.cs
@@ -63,7 +63,7 @@ public void Delete(string id)
 
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<InvoiceFileConnection> CreateAsync(InvoiceFileConnection invoiceFileConnection)
         {
@@ -77,7 +77,7 @@ public async Task<InvoiceFileConnection> CreateAsync(InvoiceFileConnection invoi
             };
 
             var entity = new List<InvoiceFileConnection>() { invoiceFileConnection };
-            var result = await DoEntityRequest(entity);
+            var result = await DoEntityRequest(entity).ConfigureAwait(false);
             return result?.FirstOrDefault();
         }
 
@@ -97,7 +97,7 @@ public async Task<InvoiceFileConnection> UpdateAsync(InvoiceFileConnection invoi
                 IncludeOnSend = invoiceFileConnection.IncludeOnSend
             };
 
-            var result = await DoEntityRequest(limitedEntity);
+            var result = await DoEntityRequest(limitedEntity).ConfigureAwait(false);
             return result;
         }
 
@@ -116,7 +116,7 @@ public async Task<List<InvoiceFileConnection>> GetConnectionsAsync(long? entityI
                 ResponseType = RequestResponseType.JSON
             };
 
-            var result = await DoEntityRequest<List<InvoiceFileConnection>>();
+            var result = await DoEntityRequest<List<InvoiceFileConnection>>().ConfigureAwait(false);
             return result;
         }
     }
diff --git a/FortnoxAPILibrary/Connectors/InvoicePaymentConnector.cs b/FortnoxAPILibrary/Connectors/InvoicePaymentConnector.cs
index cc8d4e00..04574eb2 100644
--- a/FortnoxAPILibrary/Connectors/InvoicePaymentConnector.cs
+++ b/FortnoxAPILibrary/Connectors/InvoicePaymentConnector.cs
@@ -86,23 +86,23 @@ public void Bookkeep(int? id)
 
 		public async Task<EntityCollection<InvoicePaymentSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(int? id)
 		{
-			await BaseDelete(id.ToString());
+			await BaseDelete(id.ToString()).ConfigureAwait(false);
 		}
 		public async Task<InvoicePayment> CreateAsync(InvoicePayment invoicePayment)
 		{
-			return await BaseCreate(invoicePayment);
+			return await BaseCreate(invoicePayment).ConfigureAwait(false);
 		}
 		public async Task<InvoicePayment> UpdateAsync(InvoicePayment invoicePayment)
 		{
-			return await BaseUpdate(invoicePayment, invoicePayment.Number.ToString());
+			return await BaseUpdate(invoicePayment, invoicePayment.Number.ToString()).ConfigureAwait(false);
 		}
 		public async Task<InvoicePayment> GetAsync(int? id)
 		{
-			return await BaseGet(id.ToString());
+			return await BaseGet(id.ToString()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/LabelConnector.cs b/FortnoxAPILibrary/Connectors/LabelConnector.cs
index 570842c3..cc90c43c 100644
--- a/FortnoxAPILibrary/Connectors/LabelConnector.cs
+++ b/FortnoxAPILibrary/Connectors/LabelConnector.cs
@@ -62,19 +62,19 @@ public EntityCollection<Label> Find()
 
 		public async Task<EntityCollection<Label>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(int? id)
 		{
-			await BaseDelete(id.ToString());
+			await BaseDelete(id.ToString()).ConfigureAwait(false);
 		}
 		public async Task<Label> CreateAsync(Label label)
 		{
-			return await BaseCreate(label);
+			return await BaseCreate(label).ConfigureAwait(false);
 		}
 		public async Task<Label> UpdateAsync(Label label)
 		{
-			return await BaseUpdate(label, label.Id.ToString());
+			return await BaseUpdate(label, label.Id.ToString()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/LockedPeriodConnector.cs b/FortnoxAPILibrary/Connectors/LockedPeriodConnector.cs
index 784ab320..ad7de7f3 100644
--- a/FortnoxAPILibrary/Connectors/LockedPeriodConnector.cs
+++ b/FortnoxAPILibrary/Connectors/LockedPeriodConnector.cs
@@ -29,7 +29,7 @@ public LockedPeriod Get()
 
         public async Task<LockedPeriod> GetAsync()
         {
-            return (await BaseFind())?.Entity;
+            return (await BaseFind().ConfigureAwait(false))?.Entity;
         }
     }
 }
diff --git a/FortnoxAPILibrary/Connectors/ModeOfPaymentConnector.cs b/FortnoxAPILibrary/Connectors/ModeOfPaymentConnector.cs
index 11cd6eaf..2119c343 100644
--- a/FortnoxAPILibrary/Connectors/ModeOfPaymentConnector.cs
+++ b/FortnoxAPILibrary/Connectors/ModeOfPaymentConnector.cs
@@ -77,23 +77,23 @@ public EntityCollection<ModeOfPayment> Find()
 
 		public async Task<EntityCollection<ModeOfPayment>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<ModeOfPayment> CreateAsync(ModeOfPayment modeOfPayment)
 		{
-			return await BaseCreate(modeOfPayment);
+			return await BaseCreate(modeOfPayment).ConfigureAwait(false);
 		}
 		public async Task<ModeOfPayment> UpdateAsync(ModeOfPayment modeOfPayment)
 		{
-			return await BaseUpdate(modeOfPayment, modeOfPayment.Code);
+			return await BaseUpdate(modeOfPayment, modeOfPayment.Code).ConfigureAwait(false);
 		}
 		public async Task<ModeOfPayment> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/OfferConnector.cs b/FortnoxAPILibrary/Connectors/OfferConnector.cs
index c8e156d8..80841e43 100644
--- a/FortnoxAPILibrary/Connectors/OfferConnector.cs
+++ b/FortnoxAPILibrary/Connectors/OfferConnector.cs
@@ -171,19 +171,19 @@ public byte[] Preview(int? id)
 
 		public async Task<EntityCollection<OfferSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task<Offer> CreateAsync(Offer offer)
 		{
-			return await BaseCreate(offer);
+			return await BaseCreate(offer).ConfigureAwait(false);
 		}
 		public async Task<Offer> UpdateAsync(Offer offer)
 		{
-			return await BaseUpdate(offer, offer.DocumentNumber.ToString());
+			return await BaseUpdate(offer, offer.DocumentNumber.ToString()).ConfigureAwait(false);
 		}
 		public async Task<Offer> GetAsync(int? id)
 		{
-			return await BaseGet(id.ToString());
+			return await BaseGet(id.ToString()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/OrderConnector.cs b/FortnoxAPILibrary/Connectors/OrderConnector.cs
index 9ab0a723..79abfe71 100644
--- a/FortnoxAPILibrary/Connectors/OrderConnector.cs
+++ b/FortnoxAPILibrary/Connectors/OrderConnector.cs
@@ -189,19 +189,19 @@ public byte[] Preview(int? id)
 
 		public async Task<EntityCollection<OrderSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task<Order> CreateAsync(Order order)
 		{
-			return await BaseCreate(order);
+			return await BaseCreate(order).ConfigureAwait(false);
 		}
 		public async Task<Order> UpdateAsync(Order order)
 		{
-			return await BaseUpdate(order, order.DocumentNumber.ToString());
+			return await BaseUpdate(order, order.DocumentNumber.ToString()).ConfigureAwait(false);
 		}
 		public async Task<Order> GetAsync(int? id)
 		{
-			return await BaseGet(id.ToString());
+			return await BaseGet(id.ToString()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/PredefinedAccountsConnector.cs b/FortnoxAPILibrary/Connectors/PredefinedAccountsConnector.cs
index 00ab85e9..95e0b3b7 100644
--- a/FortnoxAPILibrary/Connectors/PredefinedAccountsConnector.cs
+++ b/FortnoxAPILibrary/Connectors/PredefinedAccountsConnector.cs
@@ -53,15 +53,15 @@ public EntityCollection<PredefinedAccount> Find()
 
 		public async Task<EntityCollection<PredefinedAccount>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task<PredefinedAccount> UpdateAsync(PredefinedAccount predefinedAccount)
 		{
-			return await BaseUpdate(predefinedAccount, predefinedAccount.Name);
+			return await BaseUpdate(predefinedAccount, predefinedAccount.Name).ConfigureAwait(false);
 		}
 		public async Task<PredefinedAccount> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/PredefinedVoucherSeriesConnector.cs b/FortnoxAPILibrary/Connectors/PredefinedVoucherSeriesConnector.cs
index 1d110844..957709ce 100644
--- a/FortnoxAPILibrary/Connectors/PredefinedVoucherSeriesConnector.cs
+++ b/FortnoxAPILibrary/Connectors/PredefinedVoucherSeriesConnector.cs
@@ -53,15 +53,15 @@ public EntityCollection<PredefinedVoucherSeries> Find()
 
 		public async Task<EntityCollection<PredefinedVoucherSeries>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task<PredefinedVoucherSeries> UpdateAsync(PredefinedVoucherSeries predefinedVoucherSeries)
 		{
-			return await BaseUpdate(predefinedVoucherSeries, predefinedVoucherSeries.Name);
+			return await BaseUpdate(predefinedVoucherSeries, predefinedVoucherSeries.Name).ConfigureAwait(false);
 		}
 		public async Task<PredefinedVoucherSeries> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/PriceConnector.cs b/FortnoxAPILibrary/Connectors/PriceConnector.cs
index 25c61eaa..31b213d6 100644
--- a/FortnoxAPILibrary/Connectors/PriceConnector.cs
+++ b/FortnoxAPILibrary/Connectors/PriceConnector.cs
@@ -88,23 +88,23 @@ public EntityCollection<PriceSubset> Find(string priceListId, string articleId =
 
 		public async Task<EntityCollection<PriceSubset>> FindAsync(string priceListId, string articleId = null)
 		{
-			return await BaseFind("sublist", priceListId, articleId);
+			return await BaseFind("sublist", priceListId, articleId).ConfigureAwait(false);
 		}
         public async Task DeleteAsync(string priceListCode, string articleNumber, decimal? fromQuantity = null)
         {
-            await BaseDelete(priceListCode, articleNumber, fromQuantity?.ToString());
+            await BaseDelete(priceListCode, articleNumber, fromQuantity?.ToString()).ConfigureAwait(false);
         }
         public async Task<Price> CreateAsync(Price price)
         {
-            return await BaseCreate(price);
+            return await BaseCreate(price).ConfigureAwait(false);
         }
         public async Task<Price> UpdateAsync(Price price)
         {
-            return await BaseUpdate(price, price.PriceList, price.ArticleNumber, price.FromQuantity?.ToString());
+            return await BaseUpdate(price, price.PriceList, price.ArticleNumber, price.FromQuantity?.ToString()).ConfigureAwait(false);
         }
         public async Task<Price> GetAsync(string priceListCode, string articleNumber, decimal? fromQuantity = null)
         {
-            return await BaseGet(priceListCode, articleNumber, fromQuantity?.ToString());
+            return await BaseGet(priceListCode, articleNumber, fromQuantity?.ToString()).ConfigureAwait(false);
         }
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/PriceListConnector.cs b/FortnoxAPILibrary/Connectors/PriceListConnector.cs
index 454a8589..1c3e106f 100644
--- a/FortnoxAPILibrary/Connectors/PriceListConnector.cs
+++ b/FortnoxAPILibrary/Connectors/PriceListConnector.cs
@@ -74,19 +74,19 @@ public EntityCollection<PriceList> Find()
 
 		public async Task<EntityCollection<PriceList>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task<PriceList> CreateAsync(PriceList priceList)
 		{
-			return await BaseCreate(priceList);
+			return await BaseCreate(priceList).ConfigureAwait(false);
 		}
 		public async Task<PriceList> UpdateAsync(PriceList priceList)
 		{
-			return await BaseUpdate(priceList, priceList.Code);
+			return await BaseUpdate(priceList, priceList.Code).ConfigureAwait(false);
 		}
 		public async Task<PriceList> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/PrintTemplateConnector.cs b/FortnoxAPILibrary/Connectors/PrintTemplateConnector.cs
index f11827ab..3f05b372 100644
--- a/FortnoxAPILibrary/Connectors/PrintTemplateConnector.cs
+++ b/FortnoxAPILibrary/Connectors/PrintTemplateConnector.cs
@@ -32,7 +32,7 @@ public EntityCollection<PrintTemplate> Find()
 
 		public async Task<EntityCollection<PrintTemplate>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/ProjectConnector.cs b/FortnoxAPILibrary/Connectors/ProjectConnector.cs
index 9dca412c..624beb2a 100644
--- a/FortnoxAPILibrary/Connectors/ProjectConnector.cs
+++ b/FortnoxAPILibrary/Connectors/ProjectConnector.cs
@@ -72,23 +72,23 @@ public EntityCollection<ProjectSubset> Find()
 
 		public async Task<EntityCollection<ProjectSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<Project> CreateAsync(Project project)
 		{
-			return await BaseCreate(project);
+			return await BaseCreate(project).ConfigureAwait(false);
 		}
 		public async Task<Project> UpdateAsync(Project project)
 		{
-			return await BaseUpdate(project, project.ProjectNumber);
+			return await BaseUpdate(project, project.ProjectNumber).ConfigureAwait(false);
 		}
 		public async Task<Project> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/SIEConnector.cs b/FortnoxAPILibrary/Connectors/SIEConnector.cs
index 0714ecaa..7822ccbe 100644
--- a/FortnoxAPILibrary/Connectors/SIEConnector.cs
+++ b/FortnoxAPILibrary/Connectors/SIEConnector.cs
@@ -23,7 +23,7 @@ public async Task<byte[]> GetAsync(SIEType type)
                 Indices = new[] { type.GetStringValue() }
             };
 
-            return await DownloadFile();
+            return await DownloadFile().ConfigureAwait(false);
         }
     }
 }
diff --git a/FortnoxAPILibrary/Connectors/SalaryTransactionConnector.cs b/FortnoxAPILibrary/Connectors/SalaryTransactionConnector.cs
index 277967d3..a1ac1a72 100644
--- a/FortnoxAPILibrary/Connectors/SalaryTransactionConnector.cs
+++ b/FortnoxAPILibrary/Connectors/SalaryTransactionConnector.cs
@@ -82,23 +82,23 @@ public EntityCollection<SalaryTransactionSubset> Find()
 
 		public async Task<EntityCollection<SalaryTransactionSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(int? id)
 		{
-			await BaseDelete(id.ToString());
+			await BaseDelete(id.ToString()).ConfigureAwait(false);
 		}
 		public async Task<SalaryTransaction> CreateAsync(SalaryTransaction salaryTransaction)
 		{
-			return await BaseCreate(salaryTransaction);
+			return await BaseCreate(salaryTransaction).ConfigureAwait(false);
 		}
 		public async Task<SalaryTransaction> UpdateAsync(SalaryTransaction salaryTransaction)
 		{
-			return await BaseUpdate(salaryTransaction, salaryTransaction.SalaryRow.ToString());
+			return await BaseUpdate(salaryTransaction, salaryTransaction.SalaryRow.ToString()).ConfigureAwait(false);
 		}
 		public async Task<SalaryTransaction> GetAsync(int? id)
 		{
-			return await BaseGet(id.ToString());
+			return await BaseGet(id.ToString()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/ScheduleTimesConnector.cs b/FortnoxAPILibrary/Connectors/ScheduleTimesConnector.cs
index 18d57a63..7c5bc56b 100644
--- a/FortnoxAPILibrary/Connectors/ScheduleTimesConnector.cs
+++ b/FortnoxAPILibrary/Connectors/ScheduleTimesConnector.cs
@@ -60,19 +60,19 @@ public ScheduleTimes Reset(string employeeId, DateTime? date)
 
         public async Task<ScheduleTimes> ResetAsync(string employeeId, DateTime? date)
         {
-            return await BaseUpdate(null, employeeId, date?.ToString(APIConstants.DateFormat), "resetday");
+            return await BaseUpdate(null, employeeId, date?.ToString(APIConstants.DateFormat), "resetday").ConfigureAwait(false);
         }
         public async Task<ScheduleTimes> UpdateAsync(ScheduleTimes scheduleTime)
         {
-            return await BaseUpdate(scheduleTime,scheduleTime.EmployeeId, scheduleTime.Date?.ToString(APIConstants.DateFormat));
+            return await BaseUpdate(scheduleTime,scheduleTime.EmployeeId, scheduleTime.Date?.ToString(APIConstants.DateFormat)).ConfigureAwait(false);
         }
 		public async Task<ScheduleTimes> GetAsync(string employeeId, DateTime? date)
         {
-            return await BaseGet(employeeId, date?.ToString(APIConstants.DateFormat));
+            return await BaseGet(employeeId, date?.ToString(APIConstants.DateFormat)).ConfigureAwait(false);
         }
 		public async Task<EntityCollection<ScheduleTimes>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/SupplierConnector.cs b/FortnoxAPILibrary/Connectors/SupplierConnector.cs
index 8657d31e..b8ca4c3d 100644
--- a/FortnoxAPILibrary/Connectors/SupplierConnector.cs
+++ b/FortnoxAPILibrary/Connectors/SupplierConnector.cs
@@ -119,23 +119,23 @@ public EntityCollection<SupplierSubset> Find()
 
 		public async Task<EntityCollection<SupplierSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<Supplier> CreateAsync(Supplier supplier)
 		{
-			return await BaseCreate(supplier);
+			return await BaseCreate(supplier).ConfigureAwait(false);
 		}
 		public async Task<Supplier> UpdateAsync(Supplier supplier)
 		{
-			return await BaseUpdate(supplier, supplier.SupplierNumber);
+			return await BaseUpdate(supplier, supplier.SupplierNumber).ConfigureAwait(false);
 		}
 		public async Task<Supplier> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/SupplierInvoiceAccrualConnector.cs b/FortnoxAPILibrary/Connectors/SupplierInvoiceAccrualConnector.cs
index afdd559a..95eb94b0 100644
--- a/FortnoxAPILibrary/Connectors/SupplierInvoiceAccrualConnector.cs
+++ b/FortnoxAPILibrary/Connectors/SupplierInvoiceAccrualConnector.cs
@@ -72,23 +72,23 @@ public EntityCollection<SupplierInvoiceAccrualSubset> Find()
 
 		public async Task<EntityCollection<SupplierInvoiceAccrualSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(int? id)
 		{
-			await BaseDelete(id.ToString());
+			await BaseDelete(id.ToString()).ConfigureAwait(false);
 		}
 		public async Task<SupplierInvoiceAccrual> CreateAsync(SupplierInvoiceAccrual supplierInvoiceAccrual)
 		{
-			return await BaseCreate(supplierInvoiceAccrual);
+			return await BaseCreate(supplierInvoiceAccrual).ConfigureAwait(false);
 		}
 		public async Task<SupplierInvoiceAccrual> UpdateAsync(SupplierInvoiceAccrual supplierInvoiceAccrual)
 		{
-			return await BaseUpdate(supplierInvoiceAccrual, supplierInvoiceAccrual.SupplierInvoiceNumber.ToString());
+			return await BaseUpdate(supplierInvoiceAccrual, supplierInvoiceAccrual.SupplierInvoiceNumber.ToString()).ConfigureAwait(false);
 		}
 		public async Task<SupplierInvoiceAccrual> GetAsync(int? id)
 		{
-			return await BaseGet(id.ToString());
+			return await BaseGet(id.ToString()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/SupplierInvoiceConnector.cs b/FortnoxAPILibrary/Connectors/SupplierInvoiceConnector.cs
index bf1dd892..d146e027 100644
--- a/FortnoxAPILibrary/Connectors/SupplierInvoiceConnector.cs
+++ b/FortnoxAPILibrary/Connectors/SupplierInvoiceConnector.cs
@@ -137,19 +137,19 @@ public SupplierInvoice ApprovalBookkeep(long? id)
 
 		public async Task<EntityCollection<SupplierInvoiceSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task<SupplierInvoice> CreateAsync(SupplierInvoice supplierInvoice)
 		{
-			return await BaseCreate(supplierInvoice);
+			return await BaseCreate(supplierInvoice).ConfigureAwait(false);
 		}
 		public async Task<SupplierInvoice> UpdateAsync(SupplierInvoice supplierInvoice)
 		{
-			return await BaseUpdate(supplierInvoice, supplierInvoice.GivenNumber.ToString());
+			return await BaseUpdate(supplierInvoice, supplierInvoice.GivenNumber.ToString()).ConfigureAwait(false);
 		}
 		public async Task<SupplierInvoice> GetAsync(long? id)
 		{
-			return await BaseGet(id.ToString());
+			return await BaseGet(id.ToString()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/SupplierInvoiceExternalURLConnectionConnector.cs b/FortnoxAPILibrary/Connectors/SupplierInvoiceExternalURLConnectionConnector.cs
index 3d03c15b..5b508184 100644
--- a/FortnoxAPILibrary/Connectors/SupplierInvoiceExternalURLConnectionConnector.cs
+++ b/FortnoxAPILibrary/Connectors/SupplierInvoiceExternalURLConnectionConnector.cs
@@ -71,23 +71,23 @@ public EntityCollection<SupplierInvoiceExternalURLConnection> Find()
 
 		public async Task<EntityCollection<SupplierInvoiceExternalURLConnection>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(int? id)
 		{
-			await BaseDelete(id.ToString());
+			await BaseDelete(id.ToString()).ConfigureAwait(false);
 		}
 		public async Task<SupplierInvoiceExternalURLConnection> CreateAsync(SupplierInvoiceExternalURLConnection supplierInvoiceExternalURLConnection)
 		{
-			return await BaseCreate(supplierInvoiceExternalURLConnection);
+			return await BaseCreate(supplierInvoiceExternalURLConnection).ConfigureAwait(false);
 		}
 		public async Task<SupplierInvoiceExternalURLConnection> UpdateAsync(SupplierInvoiceExternalURLConnection supplierInvoiceExternalURLConnection)
 		{
-			return await BaseUpdate(supplierInvoiceExternalURLConnection, supplierInvoiceExternalURLConnection.Id.ToString());
+			return await BaseUpdate(supplierInvoiceExternalURLConnection, supplierInvoiceExternalURLConnection.Id.ToString()).ConfigureAwait(false);
 		}
 		public async Task<SupplierInvoiceExternalURLConnection> GetAsync(int? id)
 		{
-			return await BaseGet(id.ToString());
+			return await BaseGet(id.ToString()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/SupplierInvoiceFileConnectionConnector.cs b/FortnoxAPILibrary/Connectors/SupplierInvoiceFileConnectionConnector.cs
index a40fb14d..d0e191e2 100644
--- a/FortnoxAPILibrary/Connectors/SupplierInvoiceFileConnectionConnector.cs
+++ b/FortnoxAPILibrary/Connectors/SupplierInvoiceFileConnectionConnector.cs
@@ -67,19 +67,19 @@ public EntityCollection<SupplierInvoiceFileConnection> Find()
 
 		public async Task<EntityCollection<SupplierInvoiceFileConnection>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<SupplierInvoiceFileConnection> CreateAsync(SupplierInvoiceFileConnection supplierInvoiceFileConnection)
 		{
-			return await BaseCreate(supplierInvoiceFileConnection);
+			return await BaseCreate(supplierInvoiceFileConnection).ConfigureAwait(false);
 		}
 		public async Task<SupplierInvoiceFileConnection> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/SupplierInvoicePaymentConnector.cs b/FortnoxAPILibrary/Connectors/SupplierInvoicePaymentConnector.cs
index 335dcdc6..3703b1c7 100644
--- a/FortnoxAPILibrary/Connectors/SupplierInvoicePaymentConnector.cs
+++ b/FortnoxAPILibrary/Connectors/SupplierInvoicePaymentConnector.cs
@@ -85,23 +85,23 @@ public void Bookkeep(int? id)
 
 		public async Task<EntityCollection<SupplierInvoicePaymentSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(int? id)
 		{
-			await BaseDelete(id.ToString());
+			await BaseDelete(id.ToString()).ConfigureAwait(false);
 		}
 		public async Task<SupplierInvoicePayment> CreateAsync(SupplierInvoicePayment supplierInvoicePayment)
 		{
-			return await BaseCreate(supplierInvoicePayment);
+			return await BaseCreate(supplierInvoicePayment).ConfigureAwait(false);
 		}
 		public async Task<SupplierInvoicePayment> UpdateAsync(SupplierInvoicePayment supplierInvoicePayment)
 		{
-			return await BaseUpdate(supplierInvoicePayment, supplierInvoicePayment.Number.ToString());
+			return await BaseUpdate(supplierInvoicePayment, supplierInvoicePayment.Number.ToString()).ConfigureAwait(false);
 		}
 		public async Task<SupplierInvoicePayment> GetAsync(int? id)
 		{
-			return await BaseGet(id.ToString());
+			return await BaseGet(id.ToString()).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/TaxReductionConnector.cs b/FortnoxAPILibrary/Connectors/TaxReductionConnector.cs
index 279b51e9..649e208d 100644
--- a/FortnoxAPILibrary/Connectors/TaxReductionConnector.cs
+++ b/FortnoxAPILibrary/Connectors/TaxReductionConnector.cs
@@ -77,23 +77,23 @@ public EntityCollection<TaxReductionSubset> Find()
 
 		public async Task<EntityCollection<TaxReductionSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<TaxReduction> CreateAsync(TaxReduction taxReduction)
 		{
-			return await BaseCreate(taxReduction);
+			return await BaseCreate(taxReduction).ConfigureAwait(false);
 		}
 		public async Task<TaxReduction> UpdateAsync(TaxReduction taxReduction)
 		{
-			return await BaseUpdate(taxReduction, taxReduction.Id);
+			return await BaseUpdate(taxReduction, taxReduction.Id).ConfigureAwait(false);
 		}
 		public async Task<TaxReduction> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/TermsOfDeliveryConnector.cs b/FortnoxAPILibrary/Connectors/TermsOfDeliveryConnector.cs
index 4a5e11e0..e1b4c81d 100644
--- a/FortnoxAPILibrary/Connectors/TermsOfDeliveryConnector.cs
+++ b/FortnoxAPILibrary/Connectors/TermsOfDeliveryConnector.cs
@@ -77,23 +77,23 @@ public EntityCollection<TermsOfDelivery> Find()
 
 		public async Task<EntityCollection<TermsOfDelivery>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<TermsOfDelivery> CreateAsync(TermsOfDelivery termsOfDelivery)
 		{
-			return await BaseCreate(termsOfDelivery);
+			return await BaseCreate(termsOfDelivery).ConfigureAwait(false);
 		}
 		public async Task<TermsOfDelivery> UpdateAsync(TermsOfDelivery termsOfDelivery)
 		{
-			return await BaseUpdate(termsOfDelivery, termsOfDelivery.Code);
+			return await BaseUpdate(termsOfDelivery, termsOfDelivery.Code).ConfigureAwait(false);
 		}
 		public async Task<TermsOfDelivery> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/TermsOfPaymentConnector.cs b/FortnoxAPILibrary/Connectors/TermsOfPaymentConnector.cs
index 7db20879..457f2cf2 100644
--- a/FortnoxAPILibrary/Connectors/TermsOfPaymentConnector.cs
+++ b/FortnoxAPILibrary/Connectors/TermsOfPaymentConnector.cs
@@ -71,23 +71,23 @@ public EntityCollection<TermsOfPayment> Find()
 
 		public async Task<EntityCollection<TermsOfPayment>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<TermsOfPayment> CreateAsync(TermsOfPayment termsOfPayment)
 		{
-			return await BaseCreate(termsOfPayment);
+			return await BaseCreate(termsOfPayment).ConfigureAwait(false);
 		}
 		public async Task<TermsOfPayment> UpdateAsync(TermsOfPayment termsOfPayment)
 		{
-			return await BaseUpdate(termsOfPayment, termsOfPayment.Code);
+			return await BaseUpdate(termsOfPayment, termsOfPayment.Code).ConfigureAwait(false);
 		}
 		public async Task<TermsOfPayment> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/TrustedEmailDomainsConnector.cs b/FortnoxAPILibrary/Connectors/TrustedEmailDomainsConnector.cs
index 2c2eb399..f076cf42 100644
--- a/FortnoxAPILibrary/Connectors/TrustedEmailDomainsConnector.cs
+++ b/FortnoxAPILibrary/Connectors/TrustedEmailDomainsConnector.cs
@@ -61,19 +61,19 @@ public EntityCollection<TrustedEmailDomain> Find()
 
 		public async Task<EntityCollection<TrustedEmailDomain>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(int? id)
 		{
-			await BaseDelete(id.ToString());
+			await BaseDelete(id.ToString()).ConfigureAwait(false);
 		}
 		public async Task<TrustedEmailDomain> CreateAsync(TrustedEmailDomain trustedEmailDomains)
 		{
-			return await BaseCreate(trustedEmailDomains);
+			return await BaseCreate(trustedEmailDomains).ConfigureAwait(false);
 		}
 		public async Task<TrustedEmailDomain> GetAsync(int? id)
 		{
-			return await BaseGet(id.ToString());
+			return await BaseGet(id.ToString()).ConfigureAwait(false);
 		}
     }
 }
diff --git a/FortnoxAPILibrary/Connectors/TrustedEmailSendersConnector.cs b/FortnoxAPILibrary/Connectors/TrustedEmailSendersConnector.cs
index ec30b680..602b0645 100644
--- a/FortnoxAPILibrary/Connectors/TrustedEmailSendersConnector.cs
+++ b/FortnoxAPILibrary/Connectors/TrustedEmailSendersConnector.cs
@@ -51,18 +51,18 @@ public EmailSenders Find()
 
         public async Task<TrustedEmailSender> CreateAsync(TrustedEmailSender trustedEmailSenders)
         {
-            return await BaseCreate(trustedEmailSenders);
+            return await BaseCreate(trustedEmailSenders).ConfigureAwait(false);
         }
 
         public async Task DeleteAsync(int? id)
         {
-            await BaseDelete(id.ToString());
+            await BaseDelete(id.ToString()).ConfigureAwait(false);
         }
 
         public async Task<EmailSenders> FindAsync()
         {
             Resource = "emailsenders";
-            var res = (await BaseFind())?.Entity;
+            var res = (await BaseFind().ConfigureAwait(false))?.Entity;
             Resource = "emailsenders/trusted";
             return res;
         }
diff --git a/FortnoxAPILibrary/Connectors/UnitConnector.cs b/FortnoxAPILibrary/Connectors/UnitConnector.cs
index 5a52910f..31f573ef 100644
--- a/FortnoxAPILibrary/Connectors/UnitConnector.cs
+++ b/FortnoxAPILibrary/Connectors/UnitConnector.cs
@@ -71,23 +71,23 @@ public EntityCollection<Unit> Find()
 
 		public async Task<EntityCollection<Unit>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<Unit> CreateAsync(Unit unit)
 		{
-			return await BaseCreate(unit);
+			return await BaseCreate(unit).ConfigureAwait(false);
 		}
 		public async Task<Unit> UpdateAsync(Unit unit)
 		{
-			return await BaseUpdate(unit, unit.Code);
+			return await BaseUpdate(unit, unit.Code).ConfigureAwait(false);
 		}
 		public async Task<Unit> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/VoucherConnector.cs b/FortnoxAPILibrary/Connectors/VoucherConnector.cs
index 902f1fbf..2c0202a1 100644
--- a/FortnoxAPILibrary/Connectors/VoucherConnector.cs
+++ b/FortnoxAPILibrary/Connectors/VoucherConnector.cs
@@ -75,11 +75,11 @@ public EntityCollection<VoucherSubset> Find()
 
 		public async Task<EntityCollection<VoucherSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task<Voucher> CreateAsync(Voucher voucher)
 		{
-			return await BaseCreate(voucher);
+			return await BaseCreate(voucher).ConfigureAwait(false);
 		}
         public async Task<Voucher> GetAsync(int? id, string seriesId, int? financialYearId)
 		{
@@ -91,7 +91,7 @@ public async Task<Voucher> GetAsync(int? id, string seriesId, int? financialYear
                 };
             }
 
-            return await BaseGet(seriesId, id.ToString());
+            return await BaseGet(seriesId, id.ToString()).ConfigureAwait(false);
         }
     }
 }
diff --git a/FortnoxAPILibrary/Connectors/VoucherFileConnectionConnector.cs b/FortnoxAPILibrary/Connectors/VoucherFileConnectionConnector.cs
index 4b5170f9..a38fb676 100644
--- a/FortnoxAPILibrary/Connectors/VoucherFileConnectionConnector.cs
+++ b/FortnoxAPILibrary/Connectors/VoucherFileConnectionConnector.cs
@@ -80,19 +80,19 @@ public EntityCollection<VoucherFileConnection> Find()
 
 		public async Task<EntityCollection<VoucherFileConnection>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<VoucherFileConnection> CreateAsync(VoucherFileConnection voucherFileConnection)
 		{
-			return await BaseCreate(voucherFileConnection);
+			return await BaseCreate(voucherFileConnection).ConfigureAwait(false);
 		}
 		public async Task<VoucherFileConnection> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/VoucherSeriesConnector.cs b/FortnoxAPILibrary/Connectors/VoucherSeriesConnector.cs
index c4d8e3bd..2eb09320 100644
--- a/FortnoxAPILibrary/Connectors/VoucherSeriesConnector.cs
+++ b/FortnoxAPILibrary/Connectors/VoucherSeriesConnector.cs
@@ -62,19 +62,19 @@ public EntityCollection<VoucherSeriesSubset> Find()
 
 		public async Task<EntityCollection<VoucherSeriesSubset>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task<VoucherSeries> CreateAsync(VoucherSeries voucherSeries)
 		{
-			return await BaseCreate(voucherSeries);
+			return await BaseCreate(voucherSeries).ConfigureAwait(false);
 		}
 		public async Task<VoucherSeries> UpdateAsync(VoucherSeries voucherSeries)
 		{
-			return await BaseUpdate(voucherSeries, voucherSeries.Code);
+			return await BaseUpdate(voucherSeries, voucherSeries.Code).ConfigureAwait(false);
 		}
 		public async Task<VoucherSeries> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/Connectors/WayOfDeliveryConnector.cs b/FortnoxAPILibrary/Connectors/WayOfDeliveryConnector.cs
index 31665d69..7266b2ac 100644
--- a/FortnoxAPILibrary/Connectors/WayOfDeliveryConnector.cs
+++ b/FortnoxAPILibrary/Connectors/WayOfDeliveryConnector.cs
@@ -71,23 +71,23 @@ public EntityCollection<WayOfDelivery> Find()
 
 		public async Task<EntityCollection<WayOfDelivery>> FindAsync()
 		{
-			return await BaseFind();
+			return await BaseFind().ConfigureAwait(false);
 		}
 		public async Task DeleteAsync(string id)
 		{
-			await BaseDelete(id);
+			await BaseDelete(id).ConfigureAwait(false);
 		}
 		public async Task<WayOfDelivery> CreateAsync(WayOfDelivery wayOfDelivery)
 		{
-			return await BaseCreate(wayOfDelivery);
+			return await BaseCreate(wayOfDelivery).ConfigureAwait(false);
 		}
 		public async Task<WayOfDelivery> UpdateAsync(WayOfDelivery wayOfDelivery)
 		{
-			return await BaseUpdate(wayOfDelivery, wayOfDelivery.Code);
+			return await BaseUpdate(wayOfDelivery, wayOfDelivery.Code).ConfigureAwait(false);
 		}
 		public async Task<WayOfDelivery> GetAsync(string id)
 		{
-			return await BaseGet(id);
+			return await BaseGet(id).ConfigureAwait(false);
 		}
 	}
 }
diff --git a/FortnoxAPILibrary/EntityConnector.cs b/FortnoxAPILibrary/EntityConnector.cs
index 9cfe54bb..92cd99e2 100644
--- a/FortnoxAPILibrary/EntityConnector.cs
+++ b/FortnoxAPILibrary/EntityConnector.cs
@@ -63,7 +63,7 @@ protected async Task<TEntity> BaseCreate(TEntity entity)
             ParametersInjection = null;
 
             var wrappedEntity = new EntityWrapper<TEntity>() {Entity = entity};
-            var result = await DoEntityRequest(wrappedEntity);
+            var result = await DoEntityRequest(wrappedEntity).ConfigureAwait(false);
             return result?.Entity;
         }
 
@@ -82,7 +82,7 @@ protected async Task<TEntity> BaseUpdate(TEntity entity, params string[] indices
 
             var wrappedEntity = new EntityWrapper<TEntity>() { Entity = entity };
 
-            var result = await DoEntityRequest(wrappedEntity);
+            var result = await DoEntityRequest(wrappedEntity).ConfigureAwait(false);
             return result?.Entity;
         }
 
@@ -99,7 +99,7 @@ protected async Task BaseDelete(params string[] indices)
             };
             ParametersInjection = null;
 
-            await DoRequest();
+            await DoRequest().ConfigureAwait(false);
         }
 
         protected async Task<TEntity> BaseGet(params string[] indices)
@@ -115,7 +115,7 @@ protected async Task<TEntity> BaseGet(params string[] indices)
             };
             ParametersInjection = null;
 
-            var result = await DoEntityRequest<EntityWrapper<TEntity>>();
+            var result = await DoEntityRequest<EntityWrapper<TEntity>>().ConfigureAwait(false);
             return result?.Entity;
         }
 
@@ -133,7 +133,7 @@ protected async Task<TEntityCollection> BaseFind(params string[] indices)
             };
             ParametersInjection = null;
 
-            var result = await DoEntityRequest<TEntityCollection>();
+            var result = await DoEntityRequest<TEntityCollection>().ConfigureAwait(false);
             return result;
         }
 
@@ -199,9 +199,9 @@ protected async Task<byte[]> DoDownloadActionAsync(string documentNumber, Action
                 ResponseType = RequestResponseType.PDF
             };
 
-            var data = await DoSimpleRequest();
+            var data = await DoSimpleRequest().ConfigureAwait(false);
             if (localPath != null)
-                await data.ToFile(localPath);
+                await data.ToFile(localPath).ConfigureAwait(false);
             return data;
         }
 
@@ -232,7 +232,7 @@ protected async Task<TEntity> DoActionAsync(string documentNumber, Action action
                     break;
             }
 
-            var result = await DoEntityRequest<EntityWrapper<TEntity>>();
+            var result = await DoEntityRequest<EntityWrapper<TEntity>>().ConfigureAwait(false);
             return result?.Entity;
         }
 
diff --git a/FortnoxAPILibrary/Extensions.cs b/FortnoxAPILibrary/Extensions.cs
index 9ba008a9..31345d59 100644
--- a/FortnoxAPILibrary/Extensions.cs
+++ b/FortnoxAPILibrary/Extensions.cs
@@ -35,11 +35,11 @@ public static string GetStringValue(this Enum enumObj)
         public static async Task<byte[]> ToBytes(this Stream stream)
         {
             using var memory = new MemoryStream();
-            await stream.CopyToAsync(memory);
+            await stream.CopyToAsync(memory).ConfigureAwait(false);
             memory.Position = 0;
 
             var bytes = new byte[(int)memory.Length];
-            await memory.ReadAsync(bytes, 0, bytes.Length);
+            await memory.ReadAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
 
             return bytes;
         }
@@ -47,13 +47,13 @@ public static async Task<byte[]> ToBytes(this Stream stream)
         public static async Task<string> ToText(this Stream stream)
         {
             using var reader = new StreamReader(stream, Encoding.UTF8);
-            return await reader.ReadToEndAsync();
+            return await reader.ReadToEndAsync().ConfigureAwait(false);
         }
 
         public static async Task<FileInfo> ToFile(this Stream stream, string path)
         {
             using var file = File.Create(path);
-            await stream.CopyToAsync(file);
+            await stream.CopyToAsync(file).ConfigureAwait(false);
 
             return new FileInfo(path);
         }
@@ -61,12 +61,12 @@ public static async Task<FileInfo> ToFile(this Stream stream, string path)
         public static async Task WriteText(this Stream stream, string value)
         {
             using var streamWriter = new StreamWriter(stream);
-            await streamWriter.WriteAsync(value);
+            await streamWriter.WriteAsync(value).ConfigureAwait(false);
         }
 
         public static async Task WriteBytes(this Stream stream, byte[] data)
         {
-            await stream.WriteAsync(data, 0,data.Length);
+            await stream.WriteAsync(data, 0,data.Length).ConfigureAwait(false);
         }
 
         public static async Task<byte[]> ToBytes(this FileInfo fileInfo)
@@ -74,13 +74,13 @@ public static async Task<byte[]> ToBytes(this FileInfo fileInfo)
             var path = fileInfo.FullName;
 
             using var file = File.OpenRead(path);
-            return await file.ToBytes();
+            return await file.ToBytes().ConfigureAwait(false);
         }
 
         public static async Task<FileInfo> ToFile(this byte[] data, string path)
         {
             using var file = File.Create(path);
-            await file.WriteAsync(data, 0, data.Length);
+            await file.WriteAsync(data, 0, data.Length).ConfigureAwait(false);
 
             return new FileInfo(path);
         }
diff --git a/FortnoxAPILibrary/UrlRequestBase.cs b/FortnoxAPILibrary/UrlRequestBase.cs
index c008219b..d87015d4 100644
--- a/FortnoxAPILibrary/UrlRequestBase.cs
+++ b/FortnoxAPILibrary/UrlRequestBase.cs
@@ -85,13 +85,13 @@ public UrlRequestBase()
             serializer = new JsonEntitySerializer();
         }
 
-        
+        
         /// <summary>
         /// This method is used to throttle every call to Fortnox. 
         /// </summary>
         protected async Task RateLimit()
         {
-            if (ConnectionSettings.UseRateLimiter)
+            if (ConnectionSettings.UseRateLimiter)
                 await RateLimiter;
         }
 
@@ -112,8 +112,8 @@ protected HttpWebRequest SetupRequest(string requestUriString, RequestMethod met
             if (string.IsNullOrEmpty(ClientSecret))
                 throw new Exception("Fortnox Client Secret must be set.");
             if (string.IsNullOrEmpty(AccessToken))
-                throw new Exception("Fortnox Access Token must be set.");
-
+                throw new Exception("Fortnox Access Token must be set.");
+
             Error = null;
 
             var wr = (HttpWebRequest)WebRequest.Create(requestUriString);
@@ -136,7 +136,7 @@ protected async Task DoRequest()
 
             try
             {
-                await RateLimit();
+                await RateLimit().ConfigureAwait(false);
 
                 using var response = (HttpWebResponse) wr.GetResponse();
                 HttpStatusCode = response.StatusCode;
@@ -162,7 +162,7 @@ protected async Task<T> DoEntityRequest<T>(T entity = default)
             RequestContent = requestJson;
 
             var requestData = Encoding.UTF8.GetBytes(requestJson);
-            var responseData = await DoSimpleRequest(requestData);
+            var responseData = await DoSimpleRequest(requestData).ConfigureAwait(false);
 
             if (responseData == null)
             {
@@ -174,26 +174,26 @@ protected async Task<T> DoEntityRequest<T>(T entity = default)
             ResponseContent = responseJson;
 
             return Deserialize<T>(responseJson);
-        }
-
+        }
+
         protected async Task<byte[]> DoSimpleRequest(byte[] data = null)
         {
             var wr = SetupRequest(RequestInfo.AbsoluteUrl, RequestInfo.Method);
             ResponseContent = "";
             try
             {
-                await RateLimit();
+                await RateLimit().ConfigureAwait(false);
 
                 if (data != null && RequestInfo.Method != RequestMethod.Get)
                 {
                     using var requestStream = wr.GetRequestStream();
-                    await requestStream.WriteBytes(data);
+                    await requestStream.WriteBytes(data).ConfigureAwait(false);
                 }
 
                 using var response = (HttpWebResponse)wr.GetResponse();
                 HttpStatusCode = response.StatusCode;
                 using var responseStream = response.GetResponseStream();
-                return await responseStream.ToBytes();
+                return await responseStream.ToBytes().ConfigureAwait(false);
             }
             catch (WebException we)
             {
@@ -211,7 +211,7 @@ protected async Task<T> UploadFile<T>(byte[] fileData = null, string fileName =
 
             try
             {
-                await RateLimit();
+                await RateLimit().ConfigureAwait(false);
 
                 var rand = new Random();
                 var boundary = "----boundary" + rand.Next();
@@ -223,7 +223,7 @@ protected async Task<T> UploadFile<T>(byte[] fileData = null, string fileName =
 
                 using var dataStream = request.GetRequestStream();
                 dataStream.Write(header, 0, header.Length);
-                await dataStream.WriteAsync(fileData, 0, fileData.Length);
+                await dataStream.WriteAsync(fileData, 0, fileData.Length).ConfigureAwait(false);
                 dataStream.Write(trailer, 0, trailer.Length);
                 dataStream.Close();
 
@@ -247,7 +247,7 @@ protected async Task<byte[]> DownloadFile()
 
             try
             {
-                await RateLimit();
+                await RateLimit().ConfigureAwait(false);
 
                 var request = SetupRequest(RequestInfo.AbsoluteUrl, RequestMethod.Get);
 
@@ -255,7 +255,7 @@ protected async Task<byte[]> DownloadFile()
                 HttpStatusCode = response.StatusCode;
                 using var responseStream = response.GetResponseStream();
 
-                var data = await responseStream.ToBytes();
+                var data = await responseStream.ToBytes().ConfigureAwait(false);
                 return data;
             }
             catch (WebException we)
@@ -294,7 +294,7 @@ protected ErrorInformation HandleException(WebException we)
                 return Error;
             }
             catch (Exception)
-            {
+            {
                 //Could not interpret error message from Fortnox API.
                 return new ErrorInformation() { Message = we.Message };
             }