diff --git a/Nexmo.Api/Account.cs b/Nexmo.Api/Account.cs
index e001098b4..457e144f0 100644
--- a/Nexmo.Api/Account.cs
+++ b/Nexmo.Api/Account.cs
@@ -106,7 +106,7 @@ public class Number
         /// <returns>Balance data</returns>
         public static Balance GetBalance(Credentials credentials = null)
         {
-            return ApiRequest.DoRequest<Balance>(ApiRequest.GetBaseUriFor(typeof(Account),
+            return ApiRequest.DoGetRequest<Balance>(ApiRequest.GetBaseUriFor(typeof(Account),
                 "/account/get-balance"),
                 // TODO: using this method sig allows us to have the api auth injected at the expense of opaque code here
                 new Dictionary<string, string>(),
@@ -131,7 +131,7 @@ public static Pricing GetPricing(string country, string type = null, Credentials
                 parameters.Add("type", type);
             }
 
-            return ApiRequest.DoRequest<Pricing>(ApiRequest.GetBaseUriFor(typeof(Account),
+            return ApiRequest.DoGetRequest<Pricing>(ApiRequest.GetBaseUriFor(typeof(Account),
                 "/account/get-pricing/outbound/"),
                 parameters,
                 credentials);
@@ -145,7 +145,7 @@ public static Pricing GetPrefixPricing(string prefix, string type, Credentials c
                 { "type", type }
             }; 
 
-            return ApiRequest.DoRequest<Pricing>(ApiRequest.GetBaseUriFor(typeof(Account),
+            return ApiRequest.DoGetRequest<Pricing>(ApiRequest.GetBaseUriFor(typeof(Account),
                 "/account/get-prefix-pricing/outbound/"),
                 parameters,
                 credentials);
@@ -169,7 +169,7 @@ public static Settings SetSettings(string newsecret = null, string httpMoCallbac
             if (null != httpDrCallbackurlCom)
                 parameters.Add("drCallBackUrl", httpDrCallbackurlCom);
 
-            return ApiRequest.DoPostRequest<Settings>(ApiRequest.GetBaseUriFor(typeof(Account), "/account/settings"), parameters, credentials);
+            return ApiRequest.DoPostRequestWithUrlContent<Settings>(ApiRequest.GetBaseUriFor(typeof(Account), "/account/settings"), parameters, credentials);
         }
 
         /// <summary>
@@ -179,7 +179,7 @@ public static Settings SetSettings(string newsecret = null, string httpMoCallbac
         /// <param name="credentials">(Optional) Overridden credentials for only this request</param>
         public static void TopUp(string transaction, Credentials credentials = null)
         {
-            ApiRequest.DoRequest<Topup>(ApiRequest.GetBaseUriFor(typeof(Account), "/account/top-up"), new Dictionary<string, string>
+            ApiRequest.DoGetRequest<Topup>(ApiRequest.GetBaseUriFor(typeof(Account), "/account/top-up"), new Dictionary<string, string>
             {
                 {"trx", transaction}
             },
@@ -206,7 +206,7 @@ public static NumbersResponse GetNumbers(Credentials credentials = null)
         /// <returns></returns>
         public static NumbersResponse GetNumbers(NumbersRequest request, Credentials credentials = null)
         {
-            return ApiRequest.DoRequest<NumbersResponse>(ApiRequest.GetBaseUriFor(typeof(Account), "/account/numbers"), request, credentials);
+            return ApiRequest.DoGetRequest<NumbersResponse>(ApiRequest.GetBaseUriFor(typeof(Account), "/account/numbers"), request, ApiRequest.AuthType.Query, credentials);
         }
     }
 }
\ No newline at end of file
diff --git a/Nexmo.Api/ApiSecret.cs b/Nexmo.Api/ApiSecret.cs
index 00b3d3c3a..ccb4b4308 100644
--- a/Nexmo.Api/ApiSecret.cs
+++ b/Nexmo.Api/ApiSecret.cs
@@ -36,7 +36,7 @@ public class SecretRequest
         /// <returns>List of secrets</returns>
         public static List<Secret> ListSecrets(string apiKey, Credentials creds = null)
         {
-            return ApiRequest.DoRequest<Response<SecretList>>(ApiRequest.GetBaseUriFor(typeof(ApiSecret),
+            return ApiRequest.DoGetRequest<Response<SecretList>>(ApiRequest.GetBaseUriFor(typeof(ApiSecret),
                     $"/accounts/{apiKey}/secrets"),
                 // TODO: using this method sig allows us to have the api auth injected at the expense of opaque code here
                 new Dictionary<string, string>(),
@@ -51,7 +51,7 @@ public static List<Secret> ListSecrets(string apiKey, Credentials creds = null)
         /// <returns>The secret</returns>
         public static Secret GetSecret(string apiKey, string secretId, Credentials creds = null)
         {
-            return ApiRequest.DoRequest<Secret>(ApiRequest.GetBaseUriFor(typeof(ApiSecret),
+            return ApiRequest.DoGetRequest<Secret>(ApiRequest.GetBaseUriFor(typeof(ApiSecret),
                     $"/accounts/{apiKey}/secrets/{secretId}"),
                 // TODO: using this method sig allows us to have the api auth injected at the expense of opaque code here
                 new Dictionary<string, string>(),
@@ -72,7 +72,7 @@ public static Secret GetSecret(string apiKey, string secretId, Credentials creds
         /// <returns>The created secret</returns>
         public static Secret CreateSecret(string apiKey, string newSecret, Credentials creds = null)
         {
-            var response = ApiRequest.DoRequest("POST", ApiRequest.GetBaseUriFor(typeof(ApiSecret), $"/accounts/{apiKey}/secrets"), new SecretRequest { Secret = newSecret }, ApiRequest.AuthType.Basic, creds);
+            var response = ApiRequest.DoRequestWithJsonContent("POST", ApiRequest.GetBaseUriFor(typeof(ApiSecret), $"/accounts/{apiKey}/secrets"), new SecretRequest { Secret = newSecret }, ApiRequest.AuthType.Basic, creds);
 
             return JsonConvert.DeserializeObject<Secret>(response.JsonResponse);
         }
@@ -84,7 +84,7 @@ public static Secret CreateSecret(string apiKey, string newSecret, Credentials c
         /// <param name="secretId">ID of the API Secret</param>
         public static bool DeleteSecret(string apiKey, string secretId, Credentials creds = null)
         {
-            var response = ApiRequest.DoRequest("DELETE", ApiRequest.GetBaseUriFor(typeof(ApiSecret),
+            var response = ApiRequest.DoRequestWithJsonContent("DELETE", ApiRequest.GetBaseUriFor(typeof(ApiSecret),
                 $"/accounts/{apiKey}/secrets/{secretId}"), null, ApiRequest.AuthType.Basic, creds);
 
             return response.Status == HttpStatusCode.NoContent;
diff --git a/Nexmo.Api/Application.cs b/Nexmo.Api/Application.cs
index be90dd52b..d5b273fb3 100644
--- a/Nexmo.Api/Application.cs
+++ b/Nexmo.Api/Application.cs
@@ -127,7 +127,7 @@ public static List<ApplicationResponse> List(int PageSize = 10, int PageIndex =
             {
                 return new List<ApplicationResponse>
                 {
-                    ApiRequest.DoRequest<ApplicationResponse>(ApiRequest.GetBaseUriFor(typeof(Application),
+                    ApiRequest.DoGetRequest<ApplicationResponse>(ApiRequest.GetBaseUriFor(typeof(Application),
                     $"/v1/applications/{AppId}"),
                     // TODO: using this method sig allows us to have the api auth injected at the expense of opaque code here
                     new Dictionary<string, string>(),
@@ -135,7 +135,7 @@ public static List<ApplicationResponse> List(int PageSize = 10, int PageIndex =
                 };
             }
 
-            return ApiRequest.DoRequest<ApplicationListResponse>(ApiRequest.GetBaseUriFor(typeof(Application), "/v1/applications"),
+            return ApiRequest.DoGetRequest<ApplicationListResponse>(ApiRequest.GetBaseUriFor(typeof(Application), "/v1/applications"),
                 new Dictionary<string, string>
                 {
                     { "page_size", PageSize.ToString()},
@@ -154,7 +154,7 @@ public static List<ApplicationResponse> List(int PageSize = 10, int PageIndex =
         public static ApplicationResponse Update(ApplicationRequest request, Credentials creds = null)
         {
             var sb = ApiRequest.GetQueryStringBuilderFor(request, ApiRequest.AuthType.Query);
-            return ApiRequest.DoPutRequest<ApplicationResponse>(ApiRequest.GetBaseUriFor(typeof(Application),
+            return ApiRequest.DoPutRequestWithUrlContent<ApplicationResponse>(ApiRequest.GetBaseUriFor(typeof(Application),
                 $"/v1/applications/{request.id}?{sb}"), null, creds);
         }
 
@@ -167,7 +167,7 @@ public static ApplicationResponse Update(ApplicationRequest request, Credentials
         public static bool Delete(string appId, Credentials creds = null)
         {
             var sb = ApiRequest.GetQueryStringBuilderFor(new object(), ApiRequest.AuthType.Query);
-            var response = ApiRequest.DoDeleteRequest(ApiRequest.GetBaseUriFor(typeof(Application),
+            var response = ApiRequest.DoDeleteRequestWithUrlContent(ApiRequest.GetBaseUriFor(typeof(Application),
                 $"/v1/applications/{appId}?{sb}"), null, creds);
 
             return response.Status == HttpStatusCode.NoContent;
diff --git a/Nexmo.Api/ApplicationV2.cs b/Nexmo.Api/ApplicationV2.cs
index 07f4f153b..5cfc49f67 100644
--- a/Nexmo.Api/ApplicationV2.cs
+++ b/Nexmo.Api/ApplicationV2.cs
@@ -181,7 +181,7 @@ public class ApplicationV2
         /// <returns></returns>
         public static AppResponse Create(AppRequest request, Credentials credentials = null)
         {
-            var response = ApiRequest.DoRequest("POST",ApiRequest.GetBaseUriFor(typeof(ApplicationV2), "/v2/applications"), request, ApiRequest.AuthType.Basic,  credentials);
+            var response = ApiRequest.DoRequestWithJsonContent("POST",ApiRequest.GetBaseUriFor(typeof(ApplicationV2), "/v2/applications"), request, ApiRequest.AuthType.Basic,  credentials);
 
             return JsonConvert.DeserializeObject<AppResponse>(response.JsonResponse);
         }
@@ -194,7 +194,7 @@ public static AppResponse Create(AppRequest request, Credentials credentials = n
         /// <returns></returns>
         public static AppResponse Get(string appId, Credentials credentials = null)
         {
-            return ApiRequest.DoRequest<AppResponse>(ApiRequest.GetBaseUriFor(typeof(ApplicationV2), $"/v2/applications/{appId}"), ApiRequest.AuthType.Query, credentials);
+            return ApiRequest.DoGetRequest<AppResponse>(ApiRequest.GetBaseUriFor(typeof(ApplicationV2), $"/v2/applications/{appId}"), ApiRequest.AuthType.Query, credentials);
         }
        
         /// <summary>
@@ -208,7 +208,7 @@ public static AppResponse Get(string appId, Credentials credentials = null)
         public static List<AppResponse> List(int pageSize = 10, int page = 0,  Credentials credentials = null)
         {
             var filter = new AppListFilter() { page = page, page_size = pageSize };
-            return ApiRequest.DoRequest<AppListResponse>(ApiRequest.GetBaseUriFor(typeof(ApplicationV2), "/v2/applications"), filter, ApiRequest.AuthType.Basic, credentials)._embedded.Applications;
+            return ApiRequest.DoGetRequest<AppListResponse>(ApiRequest.GetBaseUriFor(typeof(ApplicationV2), "/v2/applications"), filter, ApiRequest.AuthType.Basic, credentials)._embedded.Applications;
             
         }
 
@@ -226,7 +226,7 @@ public static List<AppResponse> List()
         /// <returns></returns>
         public static AppResponse Update(AppRequest request, Credentials credentials = null)
         {
-            var response = ApiRequest.DoRequest("PUT",ApiRequest.GetBaseUriFor(typeof(ApplicationV2),
+            var response = ApiRequest.DoRequestWithJsonContent("PUT",ApiRequest.GetBaseUriFor(typeof(ApplicationV2),
                 $"/v2/applications/{request.Id}"), request, ApiRequest.AuthType.Basic, credentials);
 
             return JsonConvert.DeserializeObject<AppResponse>(response.JsonResponse);
@@ -240,7 +240,7 @@ public static AppResponse Update(AppRequest request, Credentials credentials = n
         /// <returns></returns>
         public static bool Delete(string appId, Credentials credentials = null)
         {
-            var response = ApiRequest.DoRequest("DELETE",ApiRequest.GetBaseUriFor(typeof(ApplicationV2),
+            var response = ApiRequest.DoRequestWithJsonContent("DELETE",ApiRequest.GetBaseUriFor(typeof(ApplicationV2),
                 $"/v2/applications/{appId}"), null, ApiRequest.AuthType.Basic, credentials);
 
             return response.Status == HttpStatusCode.NoContent;
diff --git a/Nexmo.Api/Configuration.cs b/Nexmo.Api/Configuration.cs
index 0eca0715a..680b59ccc 100644
--- a/Nexmo.Api/Configuration.cs
+++ b/Nexmo.Api/Configuration.cs
@@ -18,7 +18,7 @@ static Configuration()
 
         private Configuration()
         {
-            var logger = Api.Logger.LogProvider.GetLogger(LOGGER_CATEGORY);
+            var logger = Logger.LogProvider.GetLogger(LOGGER_CATEGORY);
             var builder = new ConfigurationBuilder()
                 .AddInMemoryCollection(new Dictionary<string, string>
                 {
diff --git a/Nexmo.Api/Number.cs b/Nexmo.Api/Number.cs
index c628fbb72..f1f9431e9 100644
--- a/Nexmo.Api/Number.cs
+++ b/Nexmo.Api/Number.cs
@@ -99,7 +99,7 @@ public class SearchResults
 
         public static SearchResults ListOwnNumbers(SearchRequest request, Credentials creds = null)
         {
-            return ApiRequest.DoRequest<SearchResults>(ApiRequest.GetBaseUriFor(typeof(Account), "/account/numbers/"), request, creds);
+            return ApiRequest.DoGetRequest<SearchResults>(ApiRequest.GetBaseUriFor(typeof(Account), "/account/numbers/"), request, ApiRequest.AuthType.Query, creds);
         }
         /// <summary>
         /// Retrieve the list of virtual numbers available for a specific country.
@@ -109,7 +109,7 @@ public static SearchResults ListOwnNumbers(SearchRequest request, Credentials cr
         /// <returns></returns>
         public static SearchResults Search(SearchRequest request, Credentials creds = null)
         {
-            return ApiRequest.DoRequest<SearchResults>(ApiRequest.GetBaseUriFor(typeof(Number), "/number/search/"), request, creds);
+            return ApiRequest.DoGetRequest<SearchResults>(ApiRequest.GetBaseUriFor(typeof(Number), "/number/search/"), request, ApiRequest.AuthType.Query, creds);
         }
 
         /// <summary>
@@ -121,7 +121,7 @@ public static SearchResults Search(SearchRequest request, Credentials creds = nu
         /// <returns></returns>
         public static ResponseBase Buy(string country, string number, Credentials creds = null)
         {
-            return ApiRequest.DoPostRequest<ResponseBase>(ApiRequest.GetBaseUriFor(typeof(Number), "/number/buy"), new Dictionary<string, string>
+            return ApiRequest.DoPostRequestWithUrlContent<ResponseBase>(ApiRequest.GetBaseUriFor(typeof(Number), "/number/buy"), new Dictionary<string, string>
             {
                 {"country", country},
                 {"msisdn", number}
@@ -149,7 +149,7 @@ public static ResponseBase Update(NumberUpdateCommand cmd, Credentials creds = n
         /// <returns></returns>
         public static ResponseBase Cancel(string country, string number, Credentials creds = null)
         {
-            return ApiRequest.DoPostRequest<ResponseBase>(ApiRequest.GetBaseUriFor(typeof(Number), "/number/cancel"), new Dictionary<string, string>
+            return ApiRequest.DoPostRequestWithUrlContent<ResponseBase>(ApiRequest.GetBaseUriFor(typeof(Number), "/number/cancel"), new Dictionary<string, string>
             {
                 {"country", country},
                 {"msisdn", number}
diff --git a/Nexmo.Api/NumberInsight.cs b/Nexmo.Api/NumberInsight.cs
index df736bc53..f200e3bf0 100644
--- a/Nexmo.Api/NumberInsight.cs
+++ b/Nexmo.Api/NumberInsight.cs
@@ -302,7 +302,7 @@ public static NumberInsightAsyncRequestResponse RequestAsync(NumberInsightAsyncR
                 parameters.Add("ip", request.IPAddress);
             }
 
-            return ApiRequest.DoPostRequest<NumberInsightAsyncRequestResponse>(ApiRequest.GetBaseUriFor(typeof(NumberVerify), "/ni/advanced/async/json"), parameters, creds);
+            return ApiRequest.DoPostRequestWithUrlContent<NumberInsightAsyncRequestResponse>(ApiRequest.GetBaseUriFor(typeof(NumberVerify), "/ni/advanced/async/json"), parameters, creds);
         }
 
         public class NumberInsightResponseException : Exception
diff --git a/Nexmo.Api/NumberVerify.cs b/Nexmo.Api/NumberVerify.cs
index 8143c6c66..483d17ae6 100644
--- a/Nexmo.Api/NumberVerify.cs
+++ b/Nexmo.Api/NumberVerify.cs
@@ -92,7 +92,7 @@ public class VerifyResponse : VerifyResponseBase
         /// <returns></returns>
         public static VerifyResponse Verify(VerifyRequest request, Credentials creds = null)
         {
-            var response = ApiRequest.DoRequest<VerifyResponse>(ApiRequest.GetBaseUriFor(typeof(NumberVerify), "/verify/json"), request, creds);
+            var response = ApiRequest.DoGetRequest<VerifyResponse>(ApiRequest.GetBaseUriFor(typeof(NumberVerify), "/verify/json"), request, ApiRequest.AuthType.Query, creds);
             ValidateVerifyResponse(response);
             return response;
         }
@@ -137,7 +137,7 @@ public class CheckResponse : VerifyResponseBase
         /// <returns></returns>
         public static CheckResponse Check(CheckRequest request, Credentials creds = null)
         {
-            var response = ApiRequest.DoRequest<CheckResponse>(ApiRequest.GetBaseUriFor(typeof(NumberVerify), "/verify/check/json"),
+            var response = ApiRequest.DoGetRequest<CheckResponse>(ApiRequest.GetBaseUriFor(typeof(NumberVerify), "/verify/check/json"),
                 new Dictionary<string, string>
                 {
                     {"request_id", request.request_id},
@@ -224,7 +224,7 @@ public class CheckObj
         /// <returns></returns>
         public static SearchResponse Search(SearchRequest request, Credentials creds = null)
         {
-            return ApiRequest.DoRequest<SearchResponse>(ApiRequest.GetBaseUriFor(typeof(NumberVerify), "/verify/search/json"), new Dictionary<string, string>()
+            return ApiRequest.DoGetRequest<SearchResponse>(ApiRequest.GetBaseUriFor(typeof(NumberVerify), "/verify/search/json"), new Dictionary<string, string>()
             {
                 {"request_id", request.request_id},
                 {"request_ids", request.request_ids}
@@ -262,7 +262,7 @@ public class ControlResponse : VerifyResponseBase
         /// <returns></returns>
         public static ControlResponse Control(ControlRequest request, Credentials creds = null)
         {
-            var response = ApiRequest.DoRequest<ControlResponse>(ApiRequest.GetBaseUriFor(typeof(NumberVerify), "/verify/control/json"), request, creds);
+            var response = ApiRequest.DoGetRequest<ControlResponse>(ApiRequest.GetBaseUriFor(typeof(NumberVerify), "/verify/control/json"), request, ApiRequest.AuthType.Query, creds);
             ValidateVerifyResponse(response);
             return response;
         }
diff --git a/Nexmo.Api/Redact.cs b/Nexmo.Api/Redact.cs
index ac2e3c4ba..e15735624 100644
--- a/Nexmo.Api/Redact.cs
+++ b/Nexmo.Api/Redact.cs
@@ -52,7 +52,7 @@ public RedactRequest(string id, string product, string type)
         /// <returns></returns>
         public static NexmoResponse RedactTransaction(RedactRequest redactRequest, Credentials creds = null)
         {
-            return ApiRequest.DoRequest("POST",ApiRequest.GetBaseUriFor(typeof(Redact), "/v1/redact/transaction"), redactRequest, ApiRequest.AuthType.Basic, creds);
+            return ApiRequest.DoRequestWithJsonContent("POST",ApiRequest.GetBaseUriFor(typeof(Redact), "/v1/redact/transaction"), redactRequest, ApiRequest.AuthType.Basic, creds);
         }
     }
 }
diff --git a/Nexmo.Api/Request/ApiRequest.cs b/Nexmo.Api/Request/ApiRequest.cs
index 672157967..adb54ac59 100644
--- a/Nexmo.Api/Request/ApiRequest.cs
+++ b/Nexmo.Api/Request/ApiRequest.cs
@@ -31,6 +31,11 @@ public enum AuthType
 
         private static string _userAgent;
 
+        /// <summary>
+        /// Sets the user agent for an HTTP request
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="creds"></param>
         internal static void SetUserAgent(ref HttpRequestMessage request, Credentials creds)
         {
             if (string.IsNullOrEmpty(_userAgent))
@@ -67,6 +72,12 @@ internal static void SetUserAgent(ref HttpRequestMessage request, Credentials cr
             request.Headers.UserAgent.ParseAdd(_userAgent);
         }
 
+        /// <summary>
+        /// Builds a query string for a get request - if there is a security secret a signature is built for the request and added to the query string
+        /// </summary>
+        /// <param name="parameters"></param>
+        /// <param name="creds"></param>
+        /// <returns></returns>
         private static StringBuilder BuildQueryString(IDictionary<string, string> parameters, Credentials creds = null)
         {
             var apiKey = (creds?.ApiKey ?? Configuration.Instance.Settings["appSettings:Nexmo.api_key"])?.ToLower();
@@ -121,6 +132,11 @@ private static StringBuilder BuildQueryString(IDictionary<string, string> parame
             return sb;
         }
 
+        /// <summary>
+        /// extracts parameters from an object into a dictionary
+        /// </summary>
+        /// <param name="parameters"></param>
+        /// <returns></returns>
         internal static Dictionary<string, string> GetParameters(object parameters)
         {
             var paramType = parameters.GetType().GetTypeInfo();
@@ -144,6 +160,12 @@ internal static Dictionary<string, string> GetParameters(object parameters)
             return apiParams;
         }
 
+        /// <summary>
+        /// Retrieves the Base URI for a given component and appends the given url to the end of it.
+        /// </summary>
+        /// <param name="component"></param>
+        /// <param name="url"></param>
+        /// <returns></returns>
         internal static Uri GetBaseUriFor(Type component, string url = null)
         {
             Uri baseUri;
@@ -162,6 +184,13 @@ internal static Uri GetBaseUriFor(Type component, string url = null)
             return string.IsNullOrEmpty(url) ? baseUri : new Uri(baseUri, url);
         }
 
+        /// <summary>
+        /// Creates a query string for the given parameters - if the auth type is zero the credentials are appended to the end of the query string
+        /// </summary>
+        /// <param name="parameters"></param>
+        /// <param name="type"></param>
+        /// <param name="creds"></param>
+        /// <returns></returns>
         internal static StringBuilder GetQueryStringBuilderFor(object parameters, AuthType type, Credentials creds = null)
         {
             var apiParams = GetParameters(parameters);
@@ -188,17 +217,12 @@ internal static StringBuilder GetQueryStringBuilderFor(object parameters, AuthTy
         /// <param name="uri">The URI to GET</param>
         /// <param name="parameters">Parameters required by the endpoint (do not include credentials)</param>
         /// <param name="creds">(Optional) Overridden credentials for only this request</param>
+        /// <exception cref="NexmoHttpRequestException">Thrown if the API encounters a non-zero result</exception>
         /// <returns></returns>
-        public static T DoRequest<T>(Uri uri, Dictionary<string, string> parameters, Credentials creds = null)
+        public static T DoGetRequest<T>(Uri uri, Dictionary<string, string> parameters, Credentials creds = null)
         {
             var sb = BuildQueryString(parameters, creds);
-            return DoRequest<T>(new Uri(uri, "?" + sb), AuthType.Query, creds);            
-        }
-
-        internal static T DoRequest<T>(Uri uri, object parameters, Credentials creds = null)
-        {
-            var sb = GetQueryStringBuilderFor(parameters, AuthType.Query, creds);
-            return DoRequest<T>(new Uri(uri, "?" + sb), AuthType.Query, creds);            
+            return DoGetRequest<T>(new Uri(uri, "?" + sb), AuthType.Query, creds);
         }
 
         /// <summary>
@@ -208,17 +232,25 @@ internal static T DoRequest<T>(Uri uri, object parameters, Credentials creds = n
         /// <param name="uri">The URI to GET</param>
         /// <param name="parameters">Parameters required by the endpoint (do not include credentials)</param>
         /// <param name="creds">(Optional) Overridden credentials for only this request</param>
-        /// <returns></returns>
-        public static T DoRequest<T>(Uri uri, object parameters, AuthType authType, Credentials creds = null)
+        /// <exception cref="NexmoHttpRequestException">Thrown if the API encounters a non-zero result</exception>
+        public static T DoGetRequest<T>(Uri uri, object parameters, AuthType authType, Credentials creds = null)
         {
-            var sb = GetQueryStringBuilderFor(parameters, authType);
+            var sb = GetQueryStringBuilderFor(parameters, authType, creds);
 
-            return DoRequest<T>(new Uri(uri, "?" + sb), authType, creds);
+            return DoGetRequest<T>(new Uri(uri, "?" + sb), authType, creds);
         }
 
-        internal static T DoRequest<T>(Uri uri, AuthType authType, Credentials creds)
+        /// <summary>
+        /// Sends an HTTP GET request to the Nexmo API without any additional parameters
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="uri"></param>
+        /// <param name="authType"></param>
+        /// <param name="creds"></param>
+        /// <exception cref="NexmoHttpRequestException">Thrown if the API encounters a non-zero result</exception>
+        public static T DoGetRequest<T>(Uri uri, AuthType authType, Credentials creds)
         {
-            var logger = Api.Logger.LogProvider.GetLogger(LOGGER_CATEGORY);
+            var logger = Logger.LogProvider.GetLogger(LOGGER_CATEGORY);
             var appId = creds?.ApplicationId ?? Configuration.Instance.Settings["appSettings:Nexmo.Application.Id"];
             var appKeyPath = creds?.ApplicationKey ?? Configuration.Instance.Settings["appSettings:Nexmo.Application.Key"];            
             var apiKey = (creds?.ApiKey ?? Configuration.Instance.Settings["appSettings:Nexmo.api_key"])?.ToLower();
@@ -243,21 +275,22 @@ internal static T DoRequest<T>(Uri uri, AuthType authType, Credentials creds)
                     Jwt.CreateToken(appId, appKeyPath));
             }
             logger.LogDebug($"GET {uri}");
-            return JsonConvert.DeserializeObject<T>(SendRequest(req).JsonResponse);
+            return JsonConvert.DeserializeObject<T>(SendHttpRequest(req).JsonResponse);
         }
 
         /// <summary>
-        /// Send a request to the Nexmo API.
+        /// Send a request to the Nexmo API using the specified HTTP method and the provided parameters.
         /// Do not include credentials in the parameters object. If you need to override credentials, use the optional Credentials parameter.
         /// </summary>
         /// <param name="method">HTTP method (POST, PUT, DELETE, etc)</param>
         /// <param name="uri">The URI to communicate with</param>
         /// <param name="parameters">Parameters required by the endpoint (do not include credentials)</param>
         /// <param name="creds">(Optional) Overridden credentials for only this request</param>
+        /// <exception cref="NexmoHttpRequestException">thrown if an error is encountered when talking to the API</exception>
         /// <returns></returns>
-        public static NexmoResponse DoRequest(string method, Uri uri, Dictionary<string, string> parameters, Credentials creds = null)
+        public static NexmoResponse DoRequestWithUrlContent(string method, Uri uri, Dictionary<string, string> parameters, Credentials creds = null)
         {
-            var logger = Api.Logger.LogProvider.GetLogger(LOGGER_CATEGORY);
+            var logger = Logger.LogProvider.GetLogger(LOGGER_CATEGORY);
             var sb = new StringBuilder();
             // if parameters is null, assume that key and secret have been taken care of
             if (null != parameters)
@@ -277,11 +310,18 @@ public static NexmoResponse DoRequest(string method, Uri uri, Dictionary<string,
             req.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/x-www-form-urlencoded");
 
             logger.LogDebug($"{method} {uri} {sb}");
-            return SendRequest(req);
+            return SendHttpRequest(req);
         }
-        public static NexmoResponse SendRequest(HttpRequestMessage req)
+
+        /// <summary>
+        /// Sends an HttpRequest on to the Nexmo API
+        /// </summary>
+        /// <param name="req"></param>
+        /// <exception cref="NexmoHttpRequestException">thrown if an error is encountered when talking to the API</exception>
+        /// <returns></returns>
+        public static NexmoResponse SendHttpRequest(HttpRequestMessage req)
         {
-            var logger = Api.Logger.LogProvider.GetLogger(LOGGER_CATEGORY);
+            var logger = Logger.LogProvider.GetLogger(LOGGER_CATEGORY);
             var response = Configuration.Instance.Client.SendAsync(req).Result;
             var stream = response.Content.ReadAsStreamAsync().Result;
             string json;
@@ -302,7 +342,7 @@ public static NexmoResponse SendRequest(HttpRequestMessage req)
             catch (HttpRequestException exception)
             {
                 logger.LogError($"FAIL: {response.StatusCode}");
-                throw new NexmoHttpRequestException(exception.Message) { StatusCode = response.StatusCode, Json = json };
+                throw new NexmoHttpRequestException(exception.Message) { HttpStatusCode = response.StatusCode, Json = json };
             }
         }
 
@@ -315,13 +355,13 @@ public static NexmoResponse SendRequest(HttpRequestMessage req)
         /// <param name="payload">Parameters required by the endpoint (do not include credentials)</param>
         /// <param name="authType">Authorization type used on the API</param>
         /// <param name="creds">(Optional) Overridden credentials for only this request</param>
-        public static NexmoResponse DoRequest(string method, Uri uri, object payload, AuthType authType, Credentials creds)
+        /// <exception cref="NexmoHttpRequestException">thrown if an error is encountered when talking to the API</exception>
+        public static NexmoResponse DoRequestWithJsonContent(string method, Uri uri, object payload, AuthType authType, Credentials creds)
         {
             var appId = creds?.ApplicationId ?? Configuration.Instance.Settings["appSettings:Nexmo.Application.Id"];
             var appKeyPath = creds?.ApplicationKey ?? Configuration.Instance.Settings["appSettings:Nexmo.Application.Key"];
             var apiKey = (creds?.ApiKey ?? Configuration.Instance.Settings["appSettings:Nexmo.api_key"])?.ToLower();
-            var apiSecret = creds?.ApiSecret ?? Configuration.Instance.Settings["appSettings:Nexmo.api_secret"];
-            var logger = Api.Logger.LogProvider.GetLogger(LOGGER_CATEGORY);
+            var apiSecret = creds?.ApiSecret ?? Configuration.Instance.Settings["appSettings:Nexmo.api_secret"];            
 
             var req = new HttpRequestMessage
             {
@@ -352,11 +392,19 @@ public static NexmoResponse DoRequest(string method, Uri uri, object payload, Au
             req.Content = new ByteArrayContent(data);
             req.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
 
-            return SendRequest(req);
+            return SendHttpRequest(req);
         }
-        internal static HttpResponseMessage DoRequestJwt(Uri uri, Credentials creds)
+
+        /// <summary>
+        /// Sends a GET request to the Nexmo API using a JWT and returns the full HTTP resonse message 
+        /// this is primarily for pulling a raw stream off an API call -e.g. a recording
+        /// </summary>
+        /// <param name="uri"></param>
+        /// <param name="creds"></param>
+        /// <returns>HttpResponseMessage</returns>
+        public static HttpResponseMessage DoGetRequestWithJwt(Uri uri, Credentials creds)
         {
-            var logger = Api.Logger.LogProvider.GetLogger(LOGGER_CATEGORY);
+            var logger = Logger.LogProvider.GetLogger(LOGGER_CATEGORY);
             var appId = creds?.ApplicationId ?? Configuration.Instance.Settings["appSettings:Nexmo.Application.Id"];
             var appKeyPath = creds?.ApplicationKey ?? Configuration.Instance.Settings["appSettings:Nexmo.Application.Key"];
 
@@ -373,37 +421,52 @@ internal static HttpResponseMessage DoRequestJwt(Uri uri, Credentials creds)
 
             logger.LogDebug($"GET {uri}");
 
-            var sendTask = Configuration.Instance.Client.SendAsync(req);
-            sendTask.Wait();
+            var result = Configuration.Instance.Client.SendAsync(req).Result;
 
-            if (!sendTask.Result.IsSuccessStatusCode)
+            try
             {
-                logger.LogError($"FAIL: {sendTask.Result.StatusCode}");
-
-                if (string.Compare(Configuration.Instance.Settings["appSettings:Nexmo.Api.EnsureSuccessStatusCode"],
-                        "true", StringComparison.OrdinalIgnoreCase) == 0)
-                {
-                    sendTask.Result.EnsureSuccessStatusCode();
-                }
+                result.EnsureSuccessStatusCode();
+                return result;
+            }
+            catch (HttpRequestException ex)
+            {
+                logger.LogError($"FAIL: {result.StatusCode}");
+                throw new NexmoHttpRequestException(ex.Message, ex) { HttpStatusCode = result.StatusCode };
             }
-            return sendTask.Result;
+            
         }
 
-        internal static T DoPostRequest<T>(Uri uri, object parameters, Credentials creds = null)
+        /// <summary>
+        /// Sends a Post request to the specified endpoint with the given parameters
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="uri"></param>
+        /// <param name="parameters"></param>
+        /// <param name="creds"></param>
+        /// <returns></returns>
+        public static T DoPostRequest<T>(Uri uri, object parameters, Credentials creds = null)
         {
             var apiParams = GetParameters(parameters);
-            return DoPostRequest<T>(uri, apiParams, creds);
+            return DoPostRequestWithUrlContent<T>(uri, apiParams, creds);
         }
 
-        internal static T DoPostRequest<T>(Uri uri, Dictionary<string, string> parameters, Credentials creds = null) 
+        /// <summary>
+        /// Send a Post Request with Url Content
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="uri"></param>
+        /// <param name="parameters"></param>
+        /// <param name="creds"></param>
+        /// <returns></returns>
+        public static T DoPostRequestWithUrlContent<T>(Uri uri, Dictionary<string, string> parameters, Credentials creds = null) 
         {
-            var response = DoRequest("POST", uri, parameters, creds);
+            var response = DoRequestWithUrlContent("POST", uri, parameters, creds);
             return JsonConvert.DeserializeObject<T>(response.JsonResponse);
         }
-        internal static T DoPutRequest<T>(Uri uri, Dictionary<string, string> parameters, Credentials creds = null) {
-            var response = DoRequest("PUT", uri, parameters, creds);
+        public static T DoPutRequestWithUrlContent<T>(Uri uri, Dictionary<string, string> parameters, Credentials creds = null) {
+            var response = DoRequestWithUrlContent("PUT", uri, parameters, creds);
             return JsonConvert.DeserializeObject<T>(response.JsonResponse);
         }
-        internal static NexmoResponse DoDeleteRequest(Uri uri, Dictionary<string, string> parameters, Credentials creds = null) => DoRequest("DELETE", uri, parameters, creds);
+        public static NexmoResponse DoDeleteRequestWithUrlContent(Uri uri, Dictionary<string, string> parameters, Credentials creds = null) => DoRequestWithUrlContent("DELETE", uri, parameters, creds);
     }
 }
\ No newline at end of file
diff --git a/Nexmo.Api/Request/NexmoHttpRequestException.cs b/Nexmo.Api/Request/NexmoHttpRequestException.cs
index 161f945e6..ce4fdf207 100644
--- a/Nexmo.Api/Request/NexmoHttpRequestException.cs
+++ b/Nexmo.Api/Request/NexmoHttpRequestException.cs
@@ -10,6 +10,6 @@ public NexmoHttpRequestException() { }
         public NexmoHttpRequestException(string message) : base(message) { }
         public NexmoHttpRequestException(string message, Exception inner) : base(message, inner){}
         public string Json { get; set; }
-        public HttpStatusCode StatusCode { get; set; }
+        public HttpStatusCode HttpStatusCode { get; set; }
     }
 }
diff --git a/Nexmo.Api/Search.cs b/Nexmo.Api/Search.cs
index 9e9c44b73..9a8c82888 100644
--- a/Nexmo.Api/Search.cs
+++ b/Nexmo.Api/Search.cs
@@ -124,7 +124,7 @@ public class SearchRequest
         /// <returns></returns>
         public static Message GetMessage(string id, Credentials creds = null)
         {
-            return ApiRequest.DoRequest<Message>(ApiRequest.GetBaseUriFor(typeof(Search), "/search/message"), new Dictionary<string, string>
+            return ApiRequest.DoGetRequest<Message>(ApiRequest.GetBaseUriFor(typeof(Search), "/search/message"), new Dictionary<string, string>
             {
                 {"id", id}
             },
@@ -139,7 +139,7 @@ public static Message GetMessage(string id, Credentials creds = null)
         /// <returns></returns>
         public static Messages<Message> GetMessages(SearchRequest request, Credentials creds = null)
         {
-            return ApiRequest.DoRequest<Messages<Message>>(ApiRequest.GetBaseUriFor(typeof(Search), "/search/messages"), request, creds);
+            return ApiRequest.DoGetRequest<Messages<Message>>(ApiRequest.GetBaseUriFor(typeof(Search), "/search/messages"), request, ApiRequest.AuthType.Query, creds);
         }
 
         /// <summary>
@@ -150,7 +150,7 @@ public static Messages<Message> GetMessages(SearchRequest request, Credentials c
         /// <returns></returns>
         public static Messages<MessageBase> GetRejections(SearchRequest request, Credentials creds = null)
         {
-            return ApiRequest.DoRequest<Messages<MessageBase>>(ApiRequest.GetBaseUriFor(typeof(Search), "/search/rejections"), request, creds);
+            return ApiRequest.DoGetRequest<Messages<MessageBase>>(ApiRequest.GetBaseUriFor(typeof(Search), "/search/rejections"), request, ApiRequest.AuthType.Query, creds);
         }
     }
 }
diff --git a/Nexmo.Api/ShortCode.cs b/Nexmo.Api/ShortCode.cs
index 9ee1b7136..7993f412b 100644
--- a/Nexmo.Api/ShortCode.cs
+++ b/Nexmo.Api/ShortCode.cs
@@ -38,7 +38,7 @@ public static SMS.SMSResponse RequestTwoFactorAuth(TwoFactorAuthRequest request,
             {
                 request.pin = new Random().Next(0, 9999);
             }
-            var response = ApiRequest.DoRequest<SMS.SMSResponse>(ApiRequest.GetBaseUriFor(typeof(ShortCode), "/sc/us/2fa/json"), request, creds);
+            var response = ApiRequest.DoGetRequest<SMS.SMSResponse>(ApiRequest.GetBaseUriFor(typeof(ShortCode), "/sc/us/2fa/json"), request, ApiRequest.AuthType.Query, creds);
             SMS.ValidateSmsResponse(response);            
             return response;
         }
@@ -57,7 +57,7 @@ public static SMS.SMSResponse RequestAlert(AlertRequest request, Dictionary<stri
             {
                 sb.AppendFormat("{0}={1}&", System.Net.WebUtility.UrlEncode(key), System.Net.WebUtility.UrlEncode(customValues[key]));
             }
-            var response = ApiRequest.DoRequest<SMS.SMSResponse>(ApiRequest.GetBaseUriFor(typeof(ShortCode), "/sc/us/alert/json?" + sb), ApiRequest.AuthType.Query, creds);             
+            var response = ApiRequest.DoGetRequest<SMS.SMSResponse>(ApiRequest.GetBaseUriFor(typeof(ShortCode), "/sc/us/alert/json?" + sb), ApiRequest.AuthType.Query, creds);             
             SMS.ValidateSmsResponse(response);
             return response;
         }
diff --git a/Nexmo.Api/Voice/Call.Stream.cs b/Nexmo.Api/Voice/Call.Stream.cs
index b451364ab..96f602b89 100644
--- a/Nexmo.Api/Voice/Call.Stream.cs
+++ b/Nexmo.Api/Voice/Call.Stream.cs
@@ -25,7 +25,7 @@ public class StreamCommand
         /// <param name="creds">(Optional) Overridden credentials for only this request</param>
         public static CallCommandResponse BeginStream(string id, StreamCommand cmd, Credentials creds = null)
         {
-            var response = ApiRequest.DoRequest("PUT", ApiRequest.GetBaseUriFor(typeof(Call), $"/v1/calls/{id}/stream"), cmd, ApiRequest.AuthType.Bearer, creds);
+            var response = ApiRequest.DoRequestWithJsonContent("PUT", ApiRequest.GetBaseUriFor(typeof(Call), $"/v1/calls/{id}/stream"), cmd, ApiRequest.AuthType.Bearer, creds);
 
             return JsonConvert.DeserializeObject<CallCommandResponse>(response.JsonResponse);
         }
@@ -37,7 +37,7 @@ public static CallCommandResponse BeginStream(string id, StreamCommand cmd, Cred
         /// <param name="creds">(Optional) Overridden credentials for only this request</param>
         public static CallCommandResponse EndStream(string id, Credentials creds = null)
         {
-            var response = ApiRequest.DoRequest("DELETE", ApiRequest.GetBaseUriFor(typeof(Call), $"/v1/calls/{id}/stream"), new {}, ApiRequest.AuthType.Bearer, creds);
+            var response = ApiRequest.DoRequestWithJsonContent("DELETE", ApiRequest.GetBaseUriFor(typeof(Call), $"/v1/calls/{id}/stream"), new {}, ApiRequest.AuthType.Bearer, creds);
 
             return JsonConvert.DeserializeObject<CallCommandResponse>(response.JsonResponse);
         }
diff --git a/Nexmo.Api/Voice/Call.Talk.cs b/Nexmo.Api/Voice/Call.Talk.cs
index 481ee9e1b..9397b3e58 100644
--- a/Nexmo.Api/Voice/Call.Talk.cs
+++ b/Nexmo.Api/Voice/Call.Talk.cs
@@ -43,7 +43,7 @@ public class DtmfCommand
         /// <param name="creds">(Optional) Overridden credentials for only this request</param>
         public static CallCommandResponse BeginTalk(string id, TalkCommand cmd, Credentials creds = null)
         {
-            var response = ApiRequest.DoRequest("PUT", ApiRequest.GetBaseUriFor(typeof(Call), $"/v1/calls/{id}/talk"), cmd, ApiRequest.AuthType.Bearer, creds);
+            var response = ApiRequest.DoRequestWithJsonContent("PUT", ApiRequest.GetBaseUriFor(typeof(Call), $"/v1/calls/{id}/talk"), cmd, ApiRequest.AuthType.Bearer, creds);
 
             return JsonConvert.DeserializeObject<CallCommandResponse>(response.JsonResponse);
         }
@@ -55,7 +55,7 @@ public static CallCommandResponse BeginTalk(string id, TalkCommand cmd, Credenti
         /// <param name="creds">(Optional) Overridden credentials for only this request</param>
         public static CallCommandResponse EndTalk(string id, Credentials creds = null)
         {
-            var response = ApiRequest.DoRequest("DELETE", ApiRequest.GetBaseUriFor(typeof(Call), $"/v1/calls/{id}/talk"), new {}, ApiRequest.AuthType.Bearer, creds);
+            var response = ApiRequest.DoRequestWithJsonContent("DELETE", ApiRequest.GetBaseUriFor(typeof(Call), $"/v1/calls/{id}/talk"), new {}, ApiRequest.AuthType.Bearer, creds);
 
             return JsonConvert.DeserializeObject<CallCommandResponse>(response.JsonResponse);
         }
@@ -68,7 +68,7 @@ public static CallCommandResponse EndTalk(string id, Credentials creds = null)
         /// <param name="creds">(Optional) Overridden credentials for only this request</param>
         public static CallCommandResponse SendDtmf(string id, DtmfCommand cmd, Credentials creds = null)
         {
-            var response = ApiRequest.DoRequest("PUT", ApiRequest.GetBaseUriFor(typeof(Call), $"/v1/calls/{id}/dtmf"), cmd, ApiRequest.AuthType.Bearer, creds);
+            var response = ApiRequest.DoRequestWithJsonContent("PUT", ApiRequest.GetBaseUriFor(typeof(Call), $"/v1/calls/{id}/dtmf"), cmd, ApiRequest.AuthType.Bearer, creds);
 
             return JsonConvert.DeserializeObject<CallCommandResponse>(response.JsonResponse);
         }
diff --git a/Nexmo.Api/Voice/Call.cs b/Nexmo.Api/Voice/Call.cs
index c25087cee..667db1932 100644
--- a/Nexmo.Api/Voice/Call.cs
+++ b/Nexmo.Api/Voice/Call.cs
@@ -286,7 +286,7 @@ public class CallList
         /// <returns></returns>
         public static CallResponse Do(CallCommand cmd, Credentials creds = null)
         {
-            var response = ApiRequest.DoRequest("POST", ApiRequest.GetBaseUriFor(typeof(Call), "/v1/calls"), cmd, ApiRequest.AuthType.Bearer, creds);
+            var response = ApiRequest.DoRequestWithJsonContent("POST", ApiRequest.GetBaseUriFor(typeof(Call), "/v1/calls"), cmd, ApiRequest.AuthType.Bearer, creds);
 
             return JsonConvert.DeserializeObject<CallResponse>(response.JsonResponse);
         }
@@ -298,7 +298,7 @@ public static CallResponse Do(CallCommand cmd, Credentials creds = null)
         /// </summary>
         public static PaginatedResponse<CallList> List(SearchFilter filter, Credentials creds = null)
         {
-            return ApiRequest.DoRequest<PaginatedResponse<CallList>>(ApiRequest.GetBaseUriFor(typeof(Call), "/v1/calls"), filter, ApiRequest.AuthType.Bearer, creds);            
+            return ApiRequest.DoGetRequest<PaginatedResponse<CallList>>(ApiRequest.GetBaseUriFor(typeof(Call), "/v1/calls"), filter, ApiRequest.AuthType.Bearer, creds);            
         }
         public static PaginatedResponse<CallList> List()
         {
@@ -315,7 +315,7 @@ public static PaginatedResponse<CallList> List()
         /// <param name="creds">(Optional) Overridden credentials for only this request</param>
         public static CallResponse Get(string id, Credentials creds = null)
         {
-            return ApiRequest.DoRequest<CallResponse>(ApiRequest.GetBaseUriFor(typeof(Call), $"/v1/calls/{id}"), new {}, ApiRequest.AuthType.Bearer, creds);            
+            return ApiRequest.DoGetRequest<CallResponse>(ApiRequest.GetBaseUriFor(typeof(Call), $"/v1/calls/{id}"), new {}, ApiRequest.AuthType.Bearer, creds);            
         }
 
         /// <summary>
@@ -326,14 +326,14 @@ public static CallResponse Get(string id, Credentials creds = null)
         /// <param name="creds">(Optional) Overridden credentials for only this request</param>
         public static CallResponse Edit(string id, CallEditCommand cmd, Credentials creds = null)
         {
-            var response = ApiRequest.DoRequest("PUT", ApiRequest.GetBaseUriFor(typeof(Call), $"/v1/calls/{id}"), cmd, ApiRequest.AuthType.Bearer, creds);
+            var response = ApiRequest.DoRequestWithJsonContent("PUT", ApiRequest.GetBaseUriFor(typeof(Call), $"/v1/calls/{id}"), cmd, ApiRequest.AuthType.Bearer, creds);
 
             return JsonConvert.DeserializeObject<CallResponse>(response.JsonResponse);
         }
 
         public static CallGetRecordingResponse GetRecording(string url, Credentials creds = null)
         {
-            using (var response = ApiRequest.DoRequestJwt(new Uri(url), creds))
+            using (var response = ApiRequest.DoGetRequestWithJwt(new Uri(url), creds))
             {
                 var readTask = response.Content.ReadAsStreamAsync();
                 byte[] bytes;