diff --git a/README.md b/README.md
index cdd75dbd..1c6fc2e1 100644
--- a/README.md
+++ b/README.md
@@ -112,13 +112,13 @@ public class Example {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
     try {
-      request.method = Method.POST;
-      request.endpoint = "mail/send";
-      request.body = mail.build();
+      request.setMethod(Method.POST);
+      request.setEndpoint("mail/send");
+      request.setBody(mail.build());
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -141,13 +141,13 @@ public class Example {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "mail/send";
-      request.body = "{\"personalizations\":[{\"to\":[{\"email\":\"test@example.com\"}],\"subject\":\"Hello World from the SendGrid Java Library!\"}],\"from\":{\"email\":\"test@example.com\"},\"content\":[{\"type\":\"text/plain\",\"value\": \"Hello, Email!\"}]}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("mail/send");
+      request.setBody("{\"personalizations\":[{\"to\":[{\"email\":\"test@example.com\"}],\"subject\":\"Hello World from the SendGrid Java Library!\"}],\"from\":{\"email\":\"test@example.com\"},\"content\":[{\"type\":\"text/plain\",\"value\": \"Hello, Email!\"}]}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -166,12 +166,12 @@ public class Example {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     try {
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "api_keys";
+      request.setMethod(Method.GET);
+      request.setEndpoint("api_keys");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/USAGE.md b/USAGE.md
index 98dcfb67..d729f75e 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -67,15 +67,13 @@ For more information, please see our [User Guide](http://sendgrid.com/docs/User_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "access_settings/activity";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("access_settings/activity");
+    request.addQueryParam("limit", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -97,13 +95,13 @@ For more information, please see our [User Guide](http://sendgrid.com/docs/User_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "access_settings/whitelist";
-    request.body = "{\"ips\":[{\"ip\":\"192.168.1.1\"},{\"ip\":\"192.*.*.*\"},{\"ip\":\"192.168.1.3/32\"}]}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("access_settings/whitelist");
+    request.setBody("{\"ips\":[{\"ip\":\"192.168.1.1\"},{\"ip\":\"192.*.*.*\"},{\"ip\":\"192.168.1.3/32\"}]}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -123,12 +121,12 @@ For more information, please see our [User Guide](http://sendgrid.com/docs/User_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "access_settings/whitelist";
+    request.setMethod(Method.GET);
+    request.setEndpoint("access_settings/whitelist");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -150,13 +148,13 @@ For more information, please see our [User Guide](http://sendgrid.com/docs/User_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "access_settings/whitelist";
-    request.body = "{\"ids\":[1,2,3]}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("access_settings/whitelist");
+    request.setBody("{\"ids\":[1,2,3]}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -178,12 +176,12 @@ For more information, please see our [User Guide](http://sendgrid.com/docs/User_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "access_settings/whitelist/{rule_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("access_settings/whitelist/{rule_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -205,12 +203,12 @@ For more information, please see our [User Guide](http://sendgrid.com/docs/User_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "access_settings/whitelist/{rule_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("access_settings/whitelist/{rule_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -235,13 +233,13 @@ For more information about alerts, please see our [User Guide](https://sendgrid.
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "alerts";
-    request.body = "{\"type\":\"stats_notification\",\"frequency\":\"daily\",\"email_to\":\"example@example.com\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("alerts");
+    request.setBody("{\"type\":\"stats_notification\",\"frequency\":\"daily\",\"email_to\":\"example@example.com\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -263,12 +261,12 @@ For more information about alerts, please see our [User Guide](https://sendgrid.
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "alerts";
+    request.setMethod(Method.GET);
+    request.setEndpoint("alerts");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -290,13 +288,13 @@ For more information about alerts, please see our [User Guide](https://sendgrid.
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "alerts/{alert_id}";
-    request.body = "{\"email_to\":\"example@example.com\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("alerts/{alert_id}");
+    request.setBody("{\"email_to\":\"example@example.com\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -318,12 +316,12 @@ For more information about alerts, please see our [User Guide](https://sendgrid.
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "alerts/{alert_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("alerts/{alert_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -345,12 +343,12 @@ For more information about alerts, please see our [User Guide](https://sendgrid.
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "alerts/{alert_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("alerts/{alert_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -377,13 +375,13 @@ See the [API Key Permissions List](https://sendgrid.com/docs/API_Reference/Web_A
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "api_keys";
-    request.body = "{\"sample\":\"data\",\"scopes\":[\"mail.send\",\"alerts.create\",\"alerts.read\"],\"name\":\"My API Key\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("api_keys");
+    request.setBody("{\"sample\":\"data\",\"scopes\":[\"mail.send\",\"alerts.create\",\"alerts.read\"],\"name\":\"My API Key\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -401,15 +399,13 @@ The API Keys feature allows customers to be able to generate an API Key credenti
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "api_keys";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("api_keys");
+    request.addQueryParam("limit", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -431,13 +427,13 @@ The API Keys feature allows customers to be able to generate an API Key credenti
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PUT;
-    request.endpoint = "api_keys/{api_key_id}";
-    request.body = "{\"scopes\":[\"user.profile.read\",\"user.profile.update\"],\"name\":\"A New Hope\"}";
+    request.setMethod(Method.PUT);
+    request.setEndpoint("api_keys/{api_key_id}");
+    request.setBody("{\"scopes\":[\"user.profile.read\",\"user.profile.update\"],\"name\":\"A New Hope\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -463,13 +459,13 @@ The API Keys feature allows customers to be able to generate an API Key credenti
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "api_keys/{api_key_id}";
-    request.body = "{\"name\":\"A New Hope\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("api_keys/{api_key_id}");
+    request.setBody("{\"name\":\"A New Hope\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -487,12 +483,12 @@ If the API Key ID does not exist an HTTP 404 will be returned.
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "api_keys/{api_key_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("api_keys/{api_key_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -518,12 +514,12 @@ The API Keys feature allows customers to be able to generate an API Key credenti
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "api_keys/{api_key_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("api_keys/{api_key_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -548,13 +544,13 @@ Each user can create up to 25 different suppression groups.
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "asm/groups";
-    request.body = "{\"is_default\":true,\"description\":\"Suggestions for products our users might like.\",\"name\":\"Product Suggestions\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("asm/groups");
+    request.setBody("{\"is_default\":true,\"description\":\"Suggestions for products our users might like.\",\"name\":\"Product) Suggestions\"}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -576,15 +572,13 @@ Suppression groups, or [unsubscribe groups](https://sendgrid.com/docs/API_Refere
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "asm/groups";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("id", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("asm/groups");
+    request.addQueryParam("id", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -606,13 +600,13 @@ Each user can create up to 25 different suppression groups.
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "asm/groups/{group_id}";
-    request.body = "{\"description\":\"Suggestions for items our users might like.\",\"name\":\"Item Suggestions\",\"id\":103}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("asm/groups/{group_id}");
+    request.setBody("{\"description\":\"Suggestions for items our users might like.\",\"name\":\"Item Suggestions\",\"id\":103}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -634,12 +628,12 @@ Each user can create up to 25 different suppression groups.
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "asm/groups/{group_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("asm/groups/{group_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -663,12 +657,12 @@ Each user can create up to 25 different suppression groups.
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "asm/groups/{group_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("asm/groups/{group_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -688,13 +682,13 @@ Suppressions are recipient email addresses that are added to [unsubscribe groups
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "asm/groups/{group_id}/suppressions";
-    request.body = "{\"recipient_emails\":[\"test1@example.com\",\"test2@example.com\"]}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("asm/groups/{group_id}/suppressions");
+    request.setBody("{\"recipient_emails\":[\"test1@example.com\",\"test2@example.com\"]}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -712,12 +706,12 @@ Suppressions are recipient email addresses that are added to [unsubscribe groups
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "asm/groups/{group_id}/suppressions";
+    request.setMethod(Method.GET);
+    request.setEndpoint("asm/groups/{group_id}/suppressions");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -737,13 +731,13 @@ Suppressions are a list of email addresses that will not receive content sent un
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "asm/groups/{group_id}/suppressions/search";
-    request.body = "{\"recipient_emails\":[\"exists1@example.com\",\"exists2@example.com\",\"doesnotexists@example.com\"]}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("asm/groups/{group_id}/suppressions/search");
+    request.setBody("{\"recipient_emails\":[\"exists1@example.com\",\"exists2@example.com\",\"doesnotexists@example.com\"]}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -761,12 +755,12 @@ Suppressions are recipient email addresses that are added to [unsubscribe groups
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "asm/groups/{group_id}/suppressions/{email}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("asm/groups/{group_id}/suppressions/{email}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -784,12 +778,12 @@ Suppressions are a list of email addresses that will not receive content sent un
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "asm/suppressions";
+    request.setMethod(Method.GET);
+    request.setEndpoint("asm/suppressions");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -807,13 +801,13 @@ A global suppression (or global unsubscribe) is an email address of a recipient
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "asm/suppressions/global";
-    request.body = "{\"recipient_emails\":[\"test1@example.com\",\"test2@example.com\"]}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("asm/suppressions/global");
+    request.setBody("{\"recipient_emails\":[\"test1@example.com\",\"test2@example.com\"]}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -833,12 +827,12 @@ A global suppression (or global unsubscribe) is an email address of a recipient
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "asm/suppressions/global/{email}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("asm/suppressions/global/{email}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -856,12 +850,12 @@ A global suppression (or global unsubscribe) is an email address of a recipient
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "asm/suppressions/global/{email}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("asm/suppressions/global/{email}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -879,12 +873,12 @@ Suppressions are a list of email addresses that will not receive content sent un
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "asm/suppressions/{email}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("asm/suppressions/{email}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -907,20 +901,18 @@ Advanced Stats provide a more in-depth view of your email statistics and the act
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "browsers/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("browsers", "test_string");
-      queryParams.put("limit", "test_string");
-      queryParams.put("offset", "test_string");
-      queryParams.put("start_date", "2016-01-01");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("browsers/stats");
+    request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("browsers", "test_string");
+      request.addQueryParam("limit", "test_string");
+      request.addQueryParam("offset", "test_string");
+      request.addQueryParam("start_date", "2016-01-01");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -947,13 +939,13 @@ For more information:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "campaigns";
-    request.body = "{\"custom_unsubscribe_url\":\"\",\"html_content\":\"<html><head><title></title></head><body><p>Check out our spring line!</p></body></html>\",\"list_ids\":[110,124],\"sender_id\":124451,\"subject\":\"New Products for Spring!\",\"plain_content\":\"Check out our spring line!\",\"suppression_group_id\":42,\"title\":\"March Newsletter\",\"segment_ids\":[110],\"categories\":[\"spring line\"],\"ip_pool\":\"marketing\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("campaigns");
+    request.setBody("{\"custom_unsubscribe_url\":\"\",\"html_content\":\"<html><head><title></title></head><body><p>Check out our) spring line!</p></body></html>\",\"list_ids\":[110,124],\"sender_id\":124451,\"subject\":\"New Products for Spring!\",\"plain_content\":\"Check out our spring line!\",\"suppression_group_id\":42,\"title\":\"March Newsletter\",\"segment_ids\":[110],\"categories\":[\"spring line\"],\"ip_pool\":\"marketing\"}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -977,16 +969,14 @@ For more information:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "campaigns";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("campaigns");
+    request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1006,13 +996,13 @@ For more information:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "campaigns/{campaign_id}";
-    request.body = "{\"html_content\":\"<html><head><title></title></head><body><p>Check out our summer line!</p></body></html>\",\"subject\":\"New Products for Summer!\",\"title\":\"May Newsletter\",\"categories\":[\"summer line\"],\"plain_content\":\"Check out our summer line!\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("campaigns/{campaign_id}");
+    request.setBody("{\"html_content\":\"<html><head><title></title></head><body><p>Check out our summer line!</p></body></html)>\",\"subject\":\"New Products for Summer!\",\"title\":\"May Newsletter\",\"categories\":[\"summer line\"],\"plain_content\":\"Check out our summer line!\"}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1034,12 +1024,12 @@ For more information:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "campaigns/{campaign_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("campaigns/{campaign_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1061,12 +1051,12 @@ For more information:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "campaigns/{campaign_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("campaigns/{campaign_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1086,13 +1076,13 @@ For more information:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "campaigns/{campaign_id}/schedules";
-    request.body = "{\"send_at\":1489451436}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("campaigns/{campaign_id}/schedules");
+    request.setBody("{\"send_at\":1489451436}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1112,13 +1102,13 @@ For more information:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "campaigns/{campaign_id}/schedules";
-    request.body = "{\"send_at\":1489771528}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("campaigns/{campaign_id}/schedules");
+    request.setBody("{\"send_at\":1489771528}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1138,12 +1128,12 @@ For more information:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "campaigns/{campaign_id}/schedules";
+    request.setMethod(Method.GET);
+    request.setEndpoint("campaigns/{campaign_id}/schedules");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1166,12 +1156,12 @@ For more information:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "campaigns/{campaign_id}/schedules";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("campaigns/{campaign_id}/schedules");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1193,12 +1183,12 @@ For more information:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "campaigns/{campaign_id}/schedules/now";
+    request.setMethod(Method.POST);
+    request.setEndpoint("campaigns/{campaign_id}/schedules/now");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1220,13 +1210,13 @@ For more information:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "campaigns/{campaign_id}/schedules/test";
-    request.body = "{\"to\":\"your.email@example.com\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("campaigns/{campaign_id}/schedules/test");
+    request.setBody("{\"to\":\"your.email@example.com\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1247,17 +1237,15 @@ Categories can help organize your email analytics by enabling you to tag emails
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "categories";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("category", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("categories");
+    request.addQueryParam("category", "test_string");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1277,20 +1265,18 @@ Categories allow you to group your emails together according to broad topics tha
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "categories/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("categories", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("categories/stats");
+    request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("categories", "test_string");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1310,21 +1296,19 @@ Categories allow you to group your emails together according to broad topics tha
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "categories/stats/sums";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("sort_by_metric", "test_string");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("sort_by_direction", "asc");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("categories/stats/sums");
+    request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("sort_by_metric", "test_string");
+      request.addQueryParam("offset", "1");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("sort_by_direction", "asc");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1347,17 +1331,15 @@ Advanced Stats provide a more in-depth view of your email statistics and the act
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "clients/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("aggregated_by", "day");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("clients/stats");
+    request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("end_date", "2016-04-01");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1383,17 +1365,15 @@ Advanced Stats provide a more in-depth view of your email statistics and the act
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "clients/{client_type}/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("aggregated_by", "day");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("clients/{client_type}/stats");
+    request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("end_date", "2016-04-01");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1414,13 +1394,13 @@ The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "contactdb/custom_fields";
-    request.body = "{\"type\":\"text\",\"name\":\"pet\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("contactdb/custom_fields");
+    request.setBody("{\"type\":\"text\",\"name\":\"pet\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1438,12 +1418,12 @@ The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/custom_fields";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/custom_fields");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1461,12 +1441,12 @@ The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/custom_fields/{custom_field_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/custom_fields/{custom_field_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1484,12 +1464,12 @@ The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "contactdb/custom_fields/{custom_field_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("contactdb/custom_fields/{custom_field_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1507,13 +1487,13 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "contactdb/lists";
-    request.body = "{\"name\":\"your list name\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("contactdb/lists");
+    request.setBody("{\"name\":\"your list name\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1531,12 +1511,12 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/lists";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/lists");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1554,13 +1534,13 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "contactdb/lists";
-    request.body = "[1,2,3,4]";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("contactdb/lists");
+    request.setBody("[1,2,3,4]");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1579,16 +1559,14 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "contactdb/lists/{list_id}";
-    request.body = "{\"name\":\"newlistname\"}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("list_id", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("contactdb/lists/{list_id}");
+    request.setBody("{\"name\":\"newlistname\"}");
+    request.addQueryParam("list_id", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1606,15 +1584,13 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/lists/{list_id}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("list_id", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/lists/{list_id}");
+    request.addQueryParam("list_id", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1632,15 +1608,13 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "contactdb/lists/{list_id}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("delete_contacts", "true");
-    request.queryParams = queryParams;
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("contactdb/lists/{list_id}");
+    request.addQueryParam("delete_contacts", "true");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1660,13 +1634,13 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "contactdb/lists/{list_id}/recipients";
-    request.body = "[\"recipient_id1\",\"recipient_id2\"]";
+    request.setMethod(Method.POST);
+    request.setEndpoint("contactdb/lists/{list_id}/recipients");
+    request.setBody("[\"recipient_id1\",\"recipient_id2\"]");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1684,17 +1658,15 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/lists/{list_id}/recipients";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("page", "1");
-      queryParams.put("page_size", "1");
-      queryParams.put("list_id", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/lists/{list_id}/recipients");
+    request.addQueryParam("page", "1");
+      request.addQueryParam("page_size", "1");
+      request.addQueryParam("list_id", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1712,12 +1684,12 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "contactdb/lists/{list_id}/recipients/{recipient_id}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("contactdb/lists/{list_id}/recipients/{recipient_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1735,16 +1707,14 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "contactdb/lists/{list_id}/recipients/{recipient_id}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("recipient_id", "1");
-      queryParams.put("list_id", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("contactdb/lists/{list_id}/recipients/{recipient_id}");
+    request.addQueryParam("recipient_id", "1");
+      request.addQueryParam("list_id", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1766,13 +1736,13 @@ The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "contactdb/recipients";
-    request.body = "[{\"first_name\":\"Guy\",\"last_name\":\"Jones\",\"email\":\"jones@example.com\"}]";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("contactdb/recipients");
+    request.setBody("[{\"first_name\":\"Guy\",\"last_name\":\"Jones\",\"email\":\"jones@example.com\"}]");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1792,13 +1762,13 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "contactdb/recipients";
-    request.body = "[{\"age\":25,\"last_name\":\"User\",\"email\":\"example@example.com\",\"first_name\":\"\"},{\"age\":25,\"last_name\":\"User\",\"email\":\"example2@example.com\",\"first_name\":\"Example\"}]";
+    request.setMethod(Method.POST);
+    request.setEndpoint("contactdb/recipients");
+    request.setBody("[{\"age\":25,\"last_name\":\"User\",\"email\":\"example@example.com\",\"first_name\":\"\"},{\"age\":25,\"last)_name\":\"User\",\"email\":\"example2@example.com\",\"first_name\":\"Example\"}]";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1819,16 +1789,14 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/recipients";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("page", "1");
-      queryParams.put("page_size", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/recipients");
+    request.addQueryParam("page", "1");
+      request.addQueryParam("page_size", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1848,13 +1816,13 @@ The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "contactdb/recipients";
-    request.body = "[\"recipient_id1\",\"recipient_id2\"]";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("contactdb/recipients");
+    request.setBody("[\"recipient_id1\",\"recipient_id2\"]");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1874,12 +1842,12 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/recipients/billable_count";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/recipients/billable_count");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1897,12 +1865,12 @@ The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/recipients/count";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/recipients/count");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1929,15 +1897,13 @@ The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/recipients/search";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("{field_name}", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/recipients/search");
+    request.addQueryParam("{field_name}", "test_string");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1955,12 +1921,12 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/recipients/{recipient_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/recipients/{recipient_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -1978,12 +1944,12 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "contactdb/recipients/{recipient_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("contactdb/recipients/{recipient_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2003,12 +1969,12 @@ The Contacts API helps you manage your [Marketing Campaigns](https://sendgrid.co
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/recipients/{recipient_id}/lists";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/recipients/{recipient_id}/lists");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2026,12 +1992,12 @@ The contactdb is a database of your contacts for [SendGrid Marketing Campaigns](
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/reserved_fields";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/reserved_fields");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2069,13 +2035,13 @@ For more information about segments in Marketing Campaigns, please see our [User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "contactdb/segments";
-    request.body = "{\"conditions\":[{\"operator\":\"eq\",\"field\":\"last_name\",\"and_or\":\"\",\"value\":\"Miller\"},{\"operator\":\"gt\",\"field\":\"last_clicked\",\"and_or\":\"and\",\"value\":\"01/02/2015\"},{\"operator\":\"eq\",\"field\":\"clicks.campaign_identifier\",\"and_or\":\"or\",\"value\":\"513\"}],\"name\":\"Last Name Miller\",\"list_id\":4}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("contactdb/segments");
+    request.setBody("{\"conditions\":[{\"operator\":\"eq\",\"field\":\"last_name\",\"and)_or\":\"\",\"value\":\"Miller\"},{\"operator\":\"gt\",\"field\":\"last_clicked\",\"and_or\":\"and\",\"value\":\"01/02/2015\"},{\"operator\":\"eq\",\"field\":\"clicks.campaign_identifier\",\"and_or\":\"or\",\"value\":\"513\"}],\"name\":\"Last Name Miller\",\"list_id\":4}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2095,12 +2061,12 @@ For more information about segments in Marketing Campaigns, please see our [User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/segments";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/segments");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2120,16 +2086,14 @@ For more information about segments in Marketing Campaigns, please see our [User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "contactdb/segments/{segment_id}";
-    request.body = "{\"conditions\":[{\"operator\":\"eq\",\"field\":\"last_name\",\"and_or\":\"\",\"value\":\"Miller\"}],\"name\":\"The Millers\",\"list_id\":5}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("segment_id", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("contactdb/segments/{segment_id}");
+    request.setBody("{\"conditions\":[{\"operator\":\"eq\",\"field\":\"last_name\",\"and)_or\":\"\",\"value\":\"Miller\"}],\"name\":\"The Millers\",\"list_id\":5}";
+    request.addQueryParam("segment_id", "test_string");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2149,15 +2113,13 @@ For more information about segments in Marketing Campaigns, please see our [User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/segments/{segment_id}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("segment_id", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/segments/{segment_id}");
+    request.addQueryParam("segment_id", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2179,15 +2141,13 @@ For more information about segments in Marketing Campaigns, please see our [User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "contactdb/segments/{segment_id}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("delete_contacts", "true");
-    request.queryParams = queryParams;
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("contactdb/segments/{segment_id}");
+    request.addQueryParam("delete_contacts", "true");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2207,16 +2167,14 @@ For more information about segments in Marketing Campaigns, please see our [User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/segments/{segment_id}/recipients";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("page", "1");
-      queryParams.put("page_size", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/segments/{segment_id}/recipients");
+    request.addQueryParam("page", "1");
+      request.addQueryParam("page_size", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2248,19 +2206,17 @@ Advanced Stats provide a more in-depth view of your email statistics and the act
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "devices/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("devices/stats");
+    request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2283,20 +2239,18 @@ Advanced Stats provide a more in-depth view of your email statistics and the act
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "geo/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("end_date", "2016-04-01");
-      queryParams.put("country", "US");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("geo/stats");
+    request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("country", "US");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
+      request.addQueryParam("start_date", "2016-01-01");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2319,19 +2273,17 @@ A single IP address or a range of IP addresses may be dedicated to an account in
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "ips";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("subuser", "test_string");
-      queryParams.put("ip", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("exclude_whitelabels", "true");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("ips");
+    request.addQueryParam("subuser", "test_string");
+      request.addQueryParam("ip", "test_string");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("exclude_whitelabels", "true");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2349,12 +2301,12 @@ A single IP address or a range of IP addresses may be dedicated to an account in
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "ips/assigned";
+    request.setMethod(Method.GET);
+    request.setEndpoint("ips/assigned");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2378,13 +2330,13 @@ If an IP pool is NOT specified for an email, it will use any IP available, inclu
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "ips/pools";
-    request.body = "{\"name\":\"marketing\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("ips/pools");
+    request.setBody("{\"name\":\"marketing\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2406,12 +2358,12 @@ If an IP pool is NOT specified for an email, it will use any IP available, inclu
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "ips/pools";
+    request.setMethod(Method.GET);
+    request.setEndpoint("ips/pools");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2433,13 +2385,13 @@ If an IP pool is NOT specified for an email, it will use any IP available, inclu
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PUT;
-    request.endpoint = "ips/pools/{pool_name}";
-    request.body = "{\"name\":\"new_pool_name\"}";
+    request.setMethod(Method.PUT);
+    request.setEndpoint("ips/pools/{pool_name}");
+    request.setBody("{\"name\":\"new_pool_name\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2461,12 +2413,12 @@ If an IP pool is NOT specified for an email, it will use any IP available, inclu
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "ips/pools/{pool_name}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("ips/pools/{pool_name}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2488,12 +2440,12 @@ If an IP pool is NOT specified for an email, it will use any IP available, inclu
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "ips/pools/{pool_name}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("ips/pools/{pool_name}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2513,13 +2465,13 @@ A single IP address or a range of IP addresses may be dedicated to an account in
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "ips/pools/{pool_name}/ips";
-    request.body = "{\"ip\":\"0.0.0.0\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("ips/pools/{pool_name}/ips");
+    request.setBody("{\"ip\":\"0.0.0.0\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2539,12 +2491,12 @@ A single IP address or a range of IP addresses may be dedicated to an account in
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "ips/pools/{pool_name}/ips/{ip}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("ips/pools/{pool_name}/ips/{ip}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2564,13 +2516,13 @@ For more general information about warming up IPs, please see our [Classroom](ht
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "ips/warmup";
-    request.body = "{\"ip\":\"0.0.0.0\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("ips/warmup");
+    request.setBody("{\"ip\":\"0.0.0.0\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2590,12 +2542,12 @@ For more general information about warming up IPs, please see our [Classroom](ht
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "ips/warmup";
+    request.setMethod(Method.GET);
+    request.setEndpoint("ips/warmup");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2615,12 +2567,12 @@ For more general information about warming up IPs, please see our [Classroom](ht
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "ips/warmup/{ip_address}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("ips/warmup/{ip_address}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2640,12 +2592,12 @@ For more general information about warming up IPs, please see our [Classroom](ht
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "ips/warmup/{ip_address}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("ips/warmup/{ip_address}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2665,12 +2617,12 @@ A single IP address or a range of IP addresses may be dedicated to an account in
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "ips/{ip_address}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("ips/{ip_address}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2695,12 +2647,12 @@ More Information:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "mail/batch";
+    request.setMethod(Method.POST);
+    request.setEndpoint("mail/batch");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2722,12 +2674,12 @@ More Information:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail/batch/{batch_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail/batch/{batch_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2751,13 +2703,13 @@ This endpoint has a helper, check it out [here](https://github.com/sendgrid/send
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "mail/send";
-    request.body = "{\"custom_args\":{\"New Argument 1\":\"New Value 1\",\"activationAttempt\":\"1\",\"customerAccountNumber\":\"[CUSTOMER ACCOUNT NUMBER GOES HERE]\"},\"from\":{\"email\":\"sam.smith@example.com\",\"name\":\"Sam Smith\"},\"attachments\":[{\"name\":\"file1\",\"filename\":\"file1.jpg\",\"content\":\"[BASE64 encoded content block here]\",\"disposition\":\"inline\",\"content_id\":\"ii_139db99fdb5c3704\",\"type\":\"jpg\"}],\"personalizations\":[{\"to\":[{\"email\":\"john.doe@example.com\",\"name\":\"John Doe\"}],\"cc\":[{\"email\":\"jane.doe@example.com\",\"name\":\"Jane Doe\"}],\"bcc\":[{\"email\":\"sam.doe@example.com\",\"name\":\"Sam Doe\"}],\"custom_args\":{\"New Argument 1\":\"New Value 1\",\"activationAttempt\":\"1\",\"customerAccountNumber\":\"[CUSTOMER ACCOUNT NUMBER GOES HERE]\"},\"headers\":{\"X-Accept-Language\":\"en\",\"X-Mailer\":\"MyApp\"},\"send_at\":1409348513,\"substitutions\":{\"type\":\"object\",\"id\":\"substitutions\"},\"subject\":\"Hello, World!\"}],\"subject\":\"Hello, World!\",\"ip_pool_name\":\"[YOUR POOL NAME GOES HERE]\",\"content\":[{\"type\":\"text/html\",\"value\":\"<html><p>Hello, world!</p><img src=[CID GOES HERE]></img></html>\"}],\"headers\":{},\"asm\":{\"groups_to_display\":[1,2,3],\"group_id\":1},\"batch_id\":\"[YOUR BATCH ID GOES HERE]\",\"tracking_settings\":{\"subscription_tracking\":{\"text\":\"If you would like to unsubscribe and stop receiveing these emails <% click here %>.\",\"enable\":true,\"html\":\"If you would like to unsubscribe and stop receiving these emails <% clickhere %>.\",\"substitution_tag\":\"<%click here%>\"},\"open_tracking\":{\"enable\":true,\"substitution_tag\":\"%opentrack\"},\"click_tracking\":{\"enable\":true,\"enable_text\":true},\"ganalytics\":{\"utm_campaign\":\"[NAME OF YOUR REFERRER SOURCE]\",\"enable\":true,\"utm_name\":\"[NAME OF YOUR CAMPAIGN]\",\"utm_term\":\"[IDENTIFY PAID KEYWORDS HERE]\",\"utm_content\":\"[USE THIS SPACE TO DIFFERENTIATE YOUR EMAIL FROM ADS]\",\"utm_medium\":\"[NAME OF YOUR MARKETING MEDIUM e.g. email]\"}},\"mail_settings\":{\"footer\":{\"text\":\"Thanks,/n The SendGrid Team\",\"enable\":true,\"html\":\"<p>Thanks</br>The SendGrid Team</p>\"},\"spam_check\":{\"threshold\":3,\"post_to_url\":\"http://example.com/compliance\",\"enable\":true},\"bypass_list_management\":{\"enable\":true},\"sandbox_mode\":{\"enable\":false},\"bcc\":{\"enable\":true,\"email\":\"ben.doe@example.com\"}},\"reply_to\":{\"email\":\"sam.smith@example.com\",\"name\":\"Sam Smith\"},\"sections\":{\"section\":{\":sectionName2\":\"section 2 text\",\":sectionName1\":\"section 1 text\"}},\"template_id\":\"[YOUR TEMPLATE ID GOES HERE]\",\"categories\":[\"category1\",\"category2\"],\"send_at\":1409348513}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("mail/send");
+    request.setBody("{\"custom_args\":{\"New Argument 1\":\"New Value 1\",\"activationAttempt\":\"1\",\"customerAccountNumber\":\")[CUSTOMER ACCOUNT NUMBER GOES HERE]\"},\"from\":{\"email\":\"sam.smith@example.com\",\"name\":\"Sam Smith\"},\"attachments\":[{\"name\":\"file1\",\"filename\":\"file1.jpg\",\"content\":\"[BASE64 encoded content block here]\",\"disposition\":\"inline\",\"content_id\":\"ii_139db99fdb5c3704\",\"type\":\"jpg\"}],\"personalizations\":[{\"to\":[{\"email\":\"john.doe@example.com\",\"name\":\"John Doe\"}],\"cc\":[{\"email\":\"jane.doe@example.com\",\"name\":\"Jane Doe\"}],\"bcc\":[{\"email\":\"sam.doe@example.com\",\"name\":\"Sam Doe\"}],\"custom_args\":{\"New Argument 1\":\"New Value 1\",\"activationAttempt\":\"1\",\"customerAccountNumber\":\"[CUSTOMER ACCOUNT NUMBER GOES HERE]\"},\"headers\":{\"X-Accept-Language\":\"en\",\"X-Mailer\":\"MyApp\"},\"send_at\":1409348513,\"substitutions\":{\"type\":\"object\",\"id\":\"substitutions\"},\"subject\":\"Hello, World!\"}],\"subject\":\"Hello, World!\",\"ip_pool_name\":\"[YOUR POOL NAME GOES HERE]\",\"content\":[{\"type\":\"text/html\",\"value\":\"<html><p>Hello, world!</p><img src=[CID GOES HERE]></img></html>\"}],\"headers\":{},\"asm\":{\"groups_to_display\":[1,2,3],\"group_id\":1},\"batch_id\":\"[YOUR BATCH ID GOES HERE]\",\"tracking_settings\":{\"subscription_tracking\":{\"text\":\"If you would like to unsubscribe and stop receiveing these emails <% click here %>.\",\"enable\":true,\"html\":\"If you would like to unsubscribe and stop receiving these emails <% clickhere %>.\",\"substitution_tag\":\"<%click here%>\"},\"open_tracking\":{\"enable\":true,\"substitution_tag\":\"%opentrack\"},\"click_tracking\":{\"enable\":true,\"enable_text\":true},\"ganalytics\":{\"utm_campaign\":\"[NAME OF YOUR REFERRER SOURCE]\",\"enable\":true,\"utm_name\":\"[NAME OF YOUR CAMPAIGN]\",\"utm_term\":\"[IDENTIFY PAID KEYWORDS HERE]\",\"utm_content\":\"[USE THIS SPACE TO DIFFERENTIATE YOUR EMAIL FROM ADS]\",\"utm_medium\":\"[NAME OF YOUR MARKETING MEDIUM e.g. email]\"}},\"mail_settings\":{\"footer\":{\"text\":\"Thanks,/n The SendGrid Team\",\"enable\":true,\"html\":\"<p>Thanks</br>The SendGrid Team</p>\"},\"spam_check\":{\"threshold\":3,\"post_to_url\":\"http://example.com/compliance\",\"enable\":true},\"bypass_list_management\":{\"enable\":true},\"sandbox_mode\":{\"enable\":false},\"bcc\":{\"enable\":true,\"email\":\"ben.doe@example.com\"}},\"reply_to\":{\"email\":\"sam.smith@example.com\",\"name\":\"Sam Smith\"},\"sections\":{\"section\":{\":sectionName2\":\"section 2 text\",\":sectionName1\":\"section 1 text\"}},\"template_id\":\"[YOUR TEMPLATE ID GOES HERE]\",\"categories\":[\"category1\",\"category2\"],\"send_at\":1409348513}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2778,16 +2730,14 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings");
+    request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2807,13 +2757,13 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/address_whitelist";
-    request.body = "{\"list\":[\"email1@example.com\",\"example.com\"],\"enabled\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/address_whitelist");
+    request.setBody("{\"list\":[\"email1@example.com\",\"example.com\"],\"enabled\":true}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2833,12 +2783,12 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/address_whitelist";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/address_whitelist");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2858,13 +2808,13 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/bcc";
-    request.body = "{\"enabled\":false,\"email\":\"email@example.com\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/bcc");
+    request.setBody("{\"enabled\":false,\"email\":\"email@example.com\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2884,12 +2834,12 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/bcc";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/bcc");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2909,13 +2859,13 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/bounce_purge";
-    request.body = "{\"hard_bounces\":5,\"soft_bounces\":5,\"enabled\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/bounce_purge");
+    request.setBody("{\"hard_bounces\":5,\"soft_bounces\":5,\"enabled\":true}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2935,12 +2885,12 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/bounce_purge";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/bounce_purge");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2960,13 +2910,13 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/footer";
-    request.body = "{\"html_content\":\"...\",\"enabled\":true,\"plain_content\":\"...\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/footer");
+    request.setBody("{\"html_content\":\"...\",\"enabled\":true,\"plain_content\":\"...\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -2986,12 +2936,12 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/footer";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/footer");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3011,13 +2961,13 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/forward_bounce";
-    request.body = "{\"enabled\":true,\"email\":\"example@example.com\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/forward_bounce");
+    request.setBody("{\"enabled\":true,\"email\":\"example@example.com\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3037,12 +2987,12 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/forward_bounce";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/forward_bounce");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3062,13 +3012,13 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/forward_spam";
-    request.body = "{\"enabled\":false,\"email\":\"\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/forward_spam");
+    request.setBody("{\"enabled\":false,\"email\":\"\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3088,12 +3038,12 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/forward_spam";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/forward_spam");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3113,13 +3063,13 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/plain_content";
-    request.body = "{\"enabled\":false}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/plain_content");
+    request.setBody("{\"enabled\":false}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3139,12 +3089,12 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/plain_content";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/plain_content");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3164,13 +3114,13 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/spam_check";
-    request.body = "{\"url\":\"url\",\"max_score\":5,\"enabled\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/spam_check");
+    request.setBody("{\"url\":\"url\",\"max_score\":5,\"enabled\":true}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3190,12 +3140,12 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/spam_check";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/spam_check");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3217,13 +3167,13 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/template";
-    request.body = "{\"html_content\":\"<% body %>\",\"enabled\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/template");
+    request.setBody("{\"html_content\":\"<% body %>\",\"enabled\":true}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3245,12 +3195,12 @@ Mail settings allow you to tell SendGrid specific things to do to every email th
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/template";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/template");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3273,20 +3223,18 @@ Advanced Stats provide a more in-depth view of your email statistics and the act
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mailbox_providers/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("end_date", "2016-04-01");
-      queryParams.put("mailbox_providers", "test_string");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("mailbox_providers/stats");
+    request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("mailbox_providers", "test_string");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
+      request.addQueryParam("start_date", "2016-01-01");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3307,16 +3255,14 @@ Our partner settings allow you to integrate your SendGrid account with our partn
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "partner_settings";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("partner_settings");
+    request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3336,13 +3282,13 @@ By integrating with New Relic, you can send your SendGrid email statistics to yo
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "partner_settings/new_relic";
-    request.body = "{\"enable_subuser_statistics\":true,\"enabled\":true,\"license_key\":\"\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("partner_settings/new_relic");
+    request.setBody("{\"enable_subuser_statistics\":true,\"enabled\":true,\"license_key\":\"\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3362,12 +3308,12 @@ By integrating with New Relic, you can send your SendGrid email statistics to yo
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "partner_settings/new_relic";
+    request.setMethod(Method.GET);
+    request.setEndpoint("partner_settings/new_relic");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3388,12 +3334,12 @@ API Keys can be used to authenticate the use of [SendGrids v3 Web API](https://s
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "scopes";
+    request.setMethod(Method.GET);
+    request.setEndpoint("scopes");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3416,13 +3362,13 @@ Sender Identities are required to be verified before use. If your domain has bee
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "senders";
-    request.body = "{\"city\":\"Denver\",\"from\":{\"email\":\"from@example.com\",\"name\":\"Example INC\"},\"zip\":\"80202\",\"country\":\"United States\",\"state\":\"Colorado\",\"address_2\":\"Apt. 456\",\"address\":\"123 Elm St.\",\"reply_to\":{\"email\":\"replyto@example.com\",\"name\":\"Example INC\"},\"nickname\":\"My Sender ID\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("senders");
+    request.setBody("{\"city\":\"Denver\",\"from\":{\"email\":\"from@example.com\",\"name\":\"Example) INC\"},\"zip\":\"80202\",\"country\":\"United States\",\"state\":\"Colorado\",\"address_2\":\"Apt. 456\",\"address\":\"123 Elm St.\",\"reply_to\":{\"email\":\"replyto@example.com\",\"name\":\"Example INC\"},\"nickname\":\"My Sender ID\"}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3440,12 +3386,12 @@ Sender Identities are required to be verified before use. If your domain has bee
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "senders";
+    request.setMethod(Method.GET);
+    request.setEndpoint("senders");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3465,13 +3411,13 @@ Partial updates are allowed, but fields that are marked as "required" in the POS
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "senders/{sender_id}";
-    request.body = "{\"city\":\"Denver\",\"from\":{\"email\":\"from@example.com\",\"name\":\"Example INC\"},\"zip\":\"80202\",\"country\":\"United States\",\"state\":\"Colorado\",\"address_2\":\"Apt. 456\",\"address\":\"123 Elm St.\",\"reply_to\":{\"email\":\"replyto@example.com\",\"name\":\"Example INC\"},\"nickname\":\"My Sender ID\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("senders/{sender_id}");
+    request.setBody("{\"city\":\"Denver\",\"from\":{\"email\":\"from@example.com\",\"name\":\"Example) INC\"},\"zip\":\"80202\",\"country\":\"United States\",\"state\":\"Colorado\",\"address_2\":\"Apt. 456\",\"address\":\"123 Elm St.\",\"reply_to\":{\"email\":\"replyto@example.com\",\"name\":\"Example INC\"},\"nickname\":\"My Sender ID\"}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3489,12 +3435,12 @@ Sender Identities are required to be verified before use. If your domain has bee
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "senders/{sender_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("senders/{sender_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3512,12 +3458,12 @@ Sender Identities are required to be verified before use. If your domain has bee
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "senders/{sender_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("senders/{sender_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3535,12 +3481,12 @@ Sender Identities are required to be verified before use. If your domain has bee
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "senders/{sender_id}/resend_verification";
+    request.setMethod(Method.POST);
+    request.setEndpoint("senders/{sender_id}/resend_verification");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3561,19 +3507,17 @@ Parent accounts will see aggregated stats for their account and all subuser acco
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("stats");
+    request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3597,13 +3541,13 @@ For more information about Subusers:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "subusers";
-    request.body = "{\"username\":\"John@example.com\",\"ips\":[\"1.1.1.1\",\"2.2.2.2\"],\"password\":\"johns_password\",\"email\":\"John@example.com\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("subusers");
+    request.setBody("{\"username\":\"John@example.com\",\"ips\":[\"1.1.1.1\",\"2.2.2.2\"],\"password\":\"johns_password\",\"email\)":\"John@example.com\"}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3624,17 +3568,15 @@ For more information about Subusers:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "subusers";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("username", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("subusers");
+    request.addQueryParam("username", "test_string");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3652,15 +3594,13 @@ This endpoint allows you to request the reputations for your subusers.
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "subusers/reputations";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("usernames", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("subusers/reputations");
+    request.addQueryParam("usernames", "test_string");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3682,20 +3622,18 @@ For more information, see our [User Guide](https://sendgrid.com/docs/User_Guide/
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "subusers/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("subusers", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("subusers/stats");
+    request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("subusers", "test_string");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3718,20 +3656,18 @@ For more information, see our [User Guide](https://sendgrid.com/docs/User_Guide/
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "subusers/stats/monthly";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("subuser", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("sort_by_metric", "test_string");
-      queryParams.put("offset", "1");
-      queryParams.put("date", "test_string");
-      queryParams.put("sort_by_direction", "asc");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("subusers/stats/monthly");
+    request.addQueryParam("subuser", "test_string");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("sort_by_metric", "test_string");
+      request.addQueryParam("offset", "1");
+      request.addQueryParam("date", "test_string");
+      request.addQueryParam("sort_by_direction", "asc");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3752,21 +3688,19 @@ For more information, see our [User Guide](https://sendgrid.com/docs/User_Guide/
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "subusers/stats/sums";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("sort_by_metric", "test_string");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("sort_by_direction", "asc");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("subusers/stats/sums");
+    request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("sort_by_metric", "test_string");
+      request.addQueryParam("offset", "1");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("sort_by_direction", "asc");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3787,13 +3721,13 @@ For more information about Subusers:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "subusers/{subuser_name}";
-    request.body = "{\"disabled\":false}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("subusers/{subuser_name}");
+    request.setBody("{\"disabled\":false}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3814,12 +3748,12 @@ For more information about Subusers:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "subusers/{subuser_name}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("subusers/{subuser_name}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3840,13 +3774,13 @@ More information:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PUT;
-    request.endpoint = "subusers/{subuser_name}/ips";
-    request.body = "[\"127.0.0.1\"]";
+    request.setMethod(Method.PUT);
+    request.setEndpoint("subusers/{subuser_name}/ips");
+    request.setBody("[\"127.0.0.1\"]");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3862,13 +3796,13 @@ Subuser monitor settings allow you to receive a sample of an outgoing message by
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PUT;
-    request.endpoint = "subusers/{subuser_name}/monitor";
-    request.body = "{\"frequency\":500,\"email\":\"example@example.com\"}";
+    request.setMethod(Method.PUT);
+    request.setEndpoint("subusers/{subuser_name}/monitor");
+    request.setBody("{\"frequency\":500,\"email\":\"example@example.com\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3884,13 +3818,13 @@ Subuser monitor settings allow you to receive a sample of an outgoing message by
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "subusers/{subuser_name}/monitor";
-    request.body = "{\"frequency\":50000,\"email\":\"example@example.com\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("subusers/{subuser_name}/monitor");
+    request.setBody("{\"frequency\":50000,\"email\":\"example@example.com\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3906,12 +3840,12 @@ Subuser monitor settings allow you to receive a sample of an outgoing message by
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "subusers/{subuser_name}/monitor";
+    request.setMethod(Method.GET);
+    request.setEndpoint("subusers/{subuser_name}/monitor");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3927,12 +3861,12 @@ Subuser monitor settings allow you to receive a sample of an outgoing message by
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "subusers/{subuser_name}/monitor";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("subusers/{subuser_name}/monitor");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3955,19 +3889,17 @@ For more information, see our [User Guide](https://sendgrid.com/docs/User_Guide/
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "subusers/{subuser_name}/stats/monthly";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("date", "test_string");
-      queryParams.put("sort_by_direction", "asc");
-      queryParams.put("limit", "1");
-      queryParams.put("sort_by_metric", "test_string");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("subusers/{subuser_name}/stats/monthly");
+    request.addQueryParam("date", "test_string");
+      request.addQueryParam("sort_by_direction", "asc");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("sort_by_metric", "test_string");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -3990,18 +3922,16 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/blocks";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("start_time", "1");
-      queryParams.put("limit", "1");
-      queryParams.put("end_time", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/blocks");
+    request.addQueryParam("start_time", "1");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("end_time", "1");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4026,13 +3956,13 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/blocks";
-    request.body = "{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/blocks");
+    request.setBody("{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4052,12 +3982,12 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/blocks/{email}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/blocks/{email}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4077,12 +4007,12 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/blocks/{email}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/blocks/{email}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4105,16 +4035,14 @@ For more information see:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/bounces";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("start_time", "1");
-      queryParams.put("end_time", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/bounces");
+    request.addQueryParam("start_time", "1");
+      request.addQueryParam("end_time", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4140,13 +4068,13 @@ Note: the `delete_all` and `emails` parameters should be used independently of e
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/bounces";
-    request.body = "{\"emails\":[\"example@example.com\",\"example2@example.com\"],\"delete_all\":true}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/bounces");
+    request.setBody("{\"emails\":[\"example@example.com\",\"example2@example.com\"],\"delete_all\":true}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4170,12 +4098,12 @@ For more information see:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/bounces/{email}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/bounces/{email}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4199,15 +4127,13 @@ For more information see:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/bounces/{email}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("email_address", "example@example.com");
-    request.queryParams = queryParams;
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/bounces/{email}");
+    request.addQueryParam("email_address", "example@example.com");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4229,18 +4155,16 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/invalid_emails";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("start_time", "1");
-      queryParams.put("limit", "1");
-      queryParams.put("end_time", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/invalid_emails");
+    request.addQueryParam("start_time", "1");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("end_time", "1");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4267,13 +4191,13 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/invalid_emails";
-    request.body = "{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/invalid_emails");
+    request.setBody("{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4295,12 +4219,12 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/invalid_emails/{email}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/invalid_emails/{email}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4322,12 +4246,12 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/invalid_emails/{email}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/invalid_emails/{email}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4347,12 +4271,12 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/spam_report/{email}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/spam_report/{email}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4372,12 +4296,12 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/spam_report/{email}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/spam_report/{email}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4397,18 +4321,16 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/spam_reports";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("start_time", "1");
-      queryParams.put("limit", "1");
-      queryParams.put("end_time", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/spam_reports");
+    request.addQueryParam("start_time", "1");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("end_time", "1");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4433,13 +4355,13 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/User
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/spam_reports";
-    request.body = "{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/spam_reports");
+    request.setBody("{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4457,18 +4379,16 @@ A global suppression (or global unsubscribe) is an email address of a recipient
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/unsubscribes";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("start_time", "1");
-      queryParams.put("limit", "1");
-      queryParams.put("end_time", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/unsubscribes");
+    request.addQueryParam("start_time", "1");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("end_time", "1");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4491,13 +4411,13 @@ Transactional templates are templates created specifically for transactional ema
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "templates";
-    request.body = "{\"name\":\"example_name\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("templates");
+    request.setBody("{\"name\":\"example_name\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4517,12 +4437,12 @@ Transactional templates are templates created specifically for transactional ema
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "templates";
+    request.setMethod(Method.GET);
+    request.setEndpoint("templates");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4543,13 +4463,13 @@ Transactional templates are templates created specifically for transactional ema
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "templates/{template_id}";
-    request.body = "{\"name\":\"new_example_name\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("templates/{template_id}");
+    request.setBody("{\"name\":\"new_example_name\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4570,12 +4490,12 @@ Transactional templates are templates created specifically for transactional ema
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "templates/{template_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("templates/{template_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4596,12 +4516,12 @@ Transactional templates are templates created specifically for transactional ema
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "templates/{template_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("templates/{template_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4622,13 +4542,13 @@ For more information about transactional templates, please see our [User Guide](
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "templates/{template_id}/versions";
-    request.body = "{\"name\":\"example_version_name\",\"html_content\":\"<%body%>\",\"plain_content\":\"<%body%>\",\"active\":1,\"template_id\":\"ddb96bbc-9b92-425e-8979-99464621b543\",\"subject\":\"<%subject%>\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("templates/{template_id}/versions");
+    request.setBody("{\"name\":\"example_version_name\",\"html_content\":\"<%body%>\",\"plain_content\":\")<%body%>\",\"active\":1,\"template_id\":\"ddb96bbc-9b92-425e-8979-99464621b543\",\"subject\":\"<%subject%>\"}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4654,13 +4574,13 @@ For more information about transactional templates, please see our [User Guide](
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "templates/{template_id}/versions/{version_id}";
-    request.body = "{\"active\":1,\"html_content\":\"<%body%>\",\"subject\":\"<%subject%>\",\"name\":\"updated_example_name\",\"plain_content\":\"<%body%>\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("templates/{template_id}/versions/{version_id}");
+    request.setBody("{\"active\":1,\"html_content\":\"<%body%>\",\"subject\":\"<%subject%>\",\"name\":\"updated_example)_name\",\"plain_content\":\"<%body%>\"}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4686,12 +4606,12 @@ For more information about transactional templates, please see our [User Guide](
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "templates/{template_id}/versions/{version_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("templates/{template_id}/versions/{version_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4717,12 +4637,12 @@ For more information about transactional templates, please see our [User Guide](
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "templates/{template_id}/versions/{version_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("templates/{template_id}/versions/{version_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4749,12 +4669,12 @@ For more information about transactional templates, please see our [User Guide](
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "templates/{template_id}/versions/{version_id}/activate";
+    request.setMethod(Method.POST);
+    request.setEndpoint("templates/{template_id}/versions/{version_id}/activate");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4777,16 +4697,14 @@ For more information about tracking, please see our [User Guide](https://sendgri
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "tracking_settings";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("tracking_settings");
+    request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4806,13 +4724,13 @@ For more information about tracking, please see our [User Guide](https://sendgri
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "tracking_settings/click";
-    request.body = "{\"enabled\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("tracking_settings/click");
+    request.setBody("{\"enabled\":true}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4832,12 +4750,12 @@ For more information about tracking, please see our [User Guide](https://sendgri
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "tracking_settings/click";
+    request.setMethod(Method.GET);
+    request.setEndpoint("tracking_settings/click");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4861,13 +4779,13 @@ For more information about tracking, please see our [User Guide](https://sendgri
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "tracking_settings/google_analytics";
-    request.body = "{\"utm_campaign\":\"website\",\"utm_term\":\"\",\"utm_content\":\"\",\"enabled\":true,\"utm_source\":\"sendgrid.com\",\"utm_medium\":\"email\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("tracking_settings/google_analytics");
+    request.setBody("{\"utm_campaign\":\"website\",\"utm_term\":\"\",\"utm_content\":\"\",\"enabled\":true,\"utm)_source\":\"sendgrid.com\",\"utm_medium\":\"email\"}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4891,12 +4809,12 @@ For more information about tracking, please see our [User Guide](https://sendgri
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "tracking_settings/google_analytics";
+    request.setMethod(Method.GET);
+    request.setEndpoint("tracking_settings/google_analytics");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4918,13 +4836,13 @@ For more information about tracking, please see our [User Guide](https://sendgri
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "tracking_settings/open";
-    request.body = "{\"enabled\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("tracking_settings/open");
+    request.setBody("{\"enabled\":true}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4946,12 +4864,12 @@ For more information about tracking, please see our [User Guide](https://sendgri
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "tracking_settings/open";
+    request.setMethod(Method.GET);
+    request.setEndpoint("tracking_settings/open");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -4973,13 +4891,13 @@ For more information about tracking, please see our [User Guide](https://sendgri
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "tracking_settings/subscription";
-    request.body = "{\"url\":\"url\",\"html_content\":\"html content\",\"enabled\":true,\"landing\":\"landing page html\",\"replace\":\"replacement tag\",\"plain_content\":\"text content\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("tracking_settings/subscription");
+    request.setBody("{\"url\":\"url\",\"html_content\":\"html content\",\"enabled\":true,\"landing\":\"landing page) html\",\"replace\":\"replacement tag\",\"plain_content\":\"text content\"}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5001,12 +4919,12 @@ For more information about tracking, please see our [User Guide](https://sendgri
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "tracking_settings/subscription";
+    request.setMethod(Method.GET);
+    request.setEndpoint("tracking_settings/subscription");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5033,12 +4951,12 @@ For more information about your user profile:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/account";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/account");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5056,12 +4974,12 @@ Your monthly credit allotment limits the number of emails you may send before in
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/credits";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/credits");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5083,13 +5001,13 @@ For more information about your user profile:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PUT;
-    request.endpoint = "user/email";
-    request.body = "{\"email\":\"example@example.com\"}";
+    request.setMethod(Method.PUT);
+    request.setEndpoint("user/email");
+    request.setBody("{\"email\":\"example@example.com\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5111,12 +5029,12 @@ For more information about your user profile:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/email";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/email");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5138,13 +5056,13 @@ For more information about your user profile:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PUT;
-    request.endpoint = "user/password";
-    request.body = "{\"new_password\":\"new_password\",\"old_password\":\"old_password\"}";
+    request.setMethod(Method.PUT);
+    request.setEndpoint("user/password");
+    request.setBody("{\"new_password\":\"new_password\",\"old_password\":\"old_password\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5168,13 +5086,13 @@ It should be noted that any one or more of the parameters can be updated via the
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "user/profile";
-    request.body = "{\"city\":\"Orange\",\"first_name\":\"Example\",\"last_name\":\"User\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("user/profile");
+    request.setBody("{\"city\":\"Orange\",\"first_name\":\"Example\",\"last_name\":\"User\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5194,12 +5112,12 @@ For more information about your user profile:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/profile";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/profile");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5220,13 +5138,13 @@ The Cancel Scheduled Sends feature allows the customer to cancel a scheduled sen
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "user/scheduled_sends";
-    request.body = "{\"batch_id\":\"YOUR_BATCH_ID\",\"status\":\"pause\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("user/scheduled_sends");
+    request.setBody("{\"batch_id\":\"YOUR_BATCH_ID\",\"status\":\"pause\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5244,12 +5162,12 @@ The Cancel Scheduled Sends feature allows the customer to cancel a scheduled sen
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/scheduled_sends";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/scheduled_sends");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5267,13 +5185,13 @@ The Cancel Scheduled Sends feature allows the customer to cancel a scheduled sen
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "user/scheduled_sends/{batch_id}";
-    request.body = "{\"status\":\"pause\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("user/scheduled_sends/{batch_id}");
+    request.setBody("{\"status\":\"pause\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5291,12 +5209,12 @@ The Cancel Scheduled Sends feature allows the customer to cancel a scheduled sen
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/scheduled_sends/{batch_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/scheduled_sends/{batch_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5314,12 +5232,12 @@ The Cancel Scheduled Sends feature allows the customer to cancel a scheduled sen
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "user/scheduled_sends/{batch_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("user/scheduled_sends/{batch_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5339,13 +5257,13 @@ The Enforced TLS settings specify whether or not the recipient is required to su
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "user/settings/enforced_tls";
-    request.body = "{\"require_tls\":true,\"require_valid_cert\":false}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("user/settings/enforced_tls");
+    request.setBody("{\"require_tls\":true,\"require_valid_cert\":false}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5365,12 +5283,12 @@ The Enforced TLS settings specify whether or not the recipient is required to su
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/settings/enforced_tls";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/settings/enforced_tls");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5392,13 +5310,13 @@ For more information about your user profile:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PUT;
-    request.endpoint = "user/username";
-    request.body = "{\"username\":\"test_username\"}";
+    request.setMethod(Method.PUT);
+    request.setEndpoint("user/username");
+    request.setBody("{\"username\":\"test_username\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5420,12 +5338,12 @@ For more information about your user profile:
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/username";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/username");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5447,13 +5365,13 @@ Common uses of this data are to remove unsubscribes, react to spam reports, dete
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "user/webhooks/event/settings";
-    request.body = "{\"group_resubscribe\":true,\"delivered\":true,\"group_unsubscribe\":true,\"spam_report\":true,\"url\":\"url\",\"enabled\":true,\"bounce\":true,\"deferred\":true,\"unsubscribe\":true,\"dropped\":true,\"open\":true,\"click\":true,\"processed\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("user/webhooks/event/settings");
+    request.setBody("{\"group_resubscribe\":true,\"delivered\":true,\"group_unsubscribe\":true,\"spam_report\":true,\"url\":\"url\)",\"enabled\":true,\"bounce\":true,\"deferred\":true,\"unsubscribe\":true,\"dropped\":true,\"open\":true,\"click\":true,\"processed\":true}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5475,12 +5393,12 @@ Common uses of this data are to remove unsubscribes, react to spam reports, dete
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/webhooks/event/settings";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/webhooks/event/settings");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5500,13 +5418,13 @@ Common uses of this data are to remove unsubscribes, react to spam reports, dete
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "user/webhooks/event/test";
-    request.body = "{\"url\":\"url\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("user/webhooks/event/test");
+    request.setBody("{\"url\":\"url\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5524,13 +5442,13 @@ The inbound parse webhook allows you to have incoming emails parsed, extracting
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "user/webhooks/parse/settings";
-    request.body = "{\"url\":\"http://email.myhosthame.com\",\"send_raw\":false,\"hostname\":\"myhostname.com\",\"spam_check\":true}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("user/webhooks/parse/settings");
+    request.setBody("{\"url\":\"http://email.myhosthame.com\",\"send_raw\":false,\"hostname\":\"myhostname.com\",\"spam)_check\":true}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5548,12 +5466,12 @@ The inbound parse webhook allows you to have incoming emails parsed, extracting
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/webhooks/parse/settings";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/webhooks/parse/settings");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5571,13 +5489,13 @@ The inbound parse webhook allows you to have incoming emails parsed, extracting
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "user/webhooks/parse/settings/{hostname}";
-    request.body = "{\"url\":\"http://newdomain.com/parse\",\"send_raw\":true,\"spam_check\":false}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("user/webhooks/parse/settings/{hostname}");
+    request.setBody("{\"url\":\"http://newdomain.com/parse\",\"send_raw\":true,\"spam_check\":false}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5595,12 +5513,12 @@ The inbound parse webhook allows you to have incoming emails parsed, extracting
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/webhooks/parse/settings/{hostname}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/webhooks/parse/settings/{hostname}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5618,12 +5536,12 @@ The inbound parse webhook allows you to have incoming emails parsed, extracting
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "user/webhooks/parse/settings/{hostname}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("user/webhooks/parse/settings/{hostname}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5643,19 +5561,17 @@ There are a number of pre-made integrations for the SendGrid Parse Webhook which
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/webhooks/parse/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "test_string");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("offset", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/webhooks/parse/stats");
+    request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "test_string");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("offset", "test_string");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5682,13 +5598,13 @@ For more information on whitelabeling, please see our [User Guide](https://sendg
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/domains";
-    request.body = "{\"automatic_security\":false,\"username\":\"john@example.com\",\"domain\":\"example.com\",\"default\":true,\"custom_spf\":true,\"ips\":[\"192.168.1.1\",\"192.168.1.2\"],\"subdomain\":\"news\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/domains");
+    request.setBody("{\"automatic)_security\":false,\"username\":\"john@example.com\",\"domain\":\"example.com\",\"default\":true,\"custom_spf\":true,\"ips\":[\"192.168.1.1\",\"192.168.1.2\"],\"subdomain\":\"news\"}";
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5709,19 +5625,17 @@ For more information on whitelabeling, please see our [User Guide](https://sendg
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/domains";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("username", "test_string");
-      queryParams.put("domain", "test_string");
-      queryParams.put("exclude_subusers", "true");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/domains");
+    request.addQueryParam("username", "test_string");
+      request.addQueryParam("domain", "test_string");
+      request.addQueryParam("exclude_subusers", "true");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5746,12 +5660,12 @@ For more information on whitelabeling, please see our [User Guide](https://sendg
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/domains/default";
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/domains/default");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5778,12 +5692,12 @@ For more information on whitelabeling, please see our [User Guide](https://sendg
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/domains/subuser";
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/domains/subuser");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5810,12 +5724,12 @@ For more information on whitelabeling, please see our [User Guide](https://sendg
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "whitelabel/domains/subuser";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("whitelabel/domains/subuser");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5835,13 +5749,13 @@ For more information on whitelabeling, please see our [User Guide](https://sendg
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "whitelabel/domains/{domain_id}";
-    request.body = "{\"default\":false,\"custom_spf\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("whitelabel/domains/{domain_id}");
+    request.setBody("{\"default\":false,\"custom_spf\":true}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5862,12 +5776,12 @@ For more information on whitelabeling, please see our [User Guide](https://sendg
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/domains/{domain_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/domains/{domain_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5887,12 +5801,12 @@ For more information on whitelabeling, please see our [User Guide](https://sendg
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "whitelabel/domains/{domain_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("whitelabel/domains/{domain_id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5919,13 +5833,13 @@ For more information on whitelabeling, please see our [User Guide](https://sendg
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/domains/{domain_id}/subuser";
-    request.body = "{\"username\":\"jane@example.com\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/domains/{domain_id}/subuser");
+    request.setBody("{\"username\":\"jane@example.com\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5950,13 +5864,13 @@ For more information on whitelabeling, please see our [User Guide](https://sendg
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/domains/{id}/ips";
-    request.body = "{\"ip\":\"192.168.0.1\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/domains/{id}/ips");
+    request.setBody("{\"ip\":\"192.168.0.1\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -5982,12 +5896,12 @@ For more information on whitelabeling, please see our [User Guide](https://sendg
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "whitelabel/domains/{id}/ips/{ip}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("whitelabel/domains/{id}/ips/{ip}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6012,12 +5926,12 @@ For more information on whitelabeling, please see our [User Guide](https://sendg
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/domains/{id}/validate";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/domains/{id}/validate");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6039,13 +5953,13 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/ips";
-    request.body = "{\"ip\":\"192.168.1.1\",\"domain\":\"example.com\",\"subdomain\":\"email\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/ips");
+    request.setBody("{\"ip\":\"192.168.1.1\",\"domain\":\"example.com\",\"subdomain\":\"email\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6067,17 +5981,15 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/ips";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("ip", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/ips");
+    request.addQueryParam("ip", "test_string");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6097,12 +6009,12 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/ips/{id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/ips/{id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6122,12 +6034,12 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "whitelabel/ips/{id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("whitelabel/ips/{id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6147,12 +6059,12 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/ips/{id}/validate";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/ips/{id}/validate");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6172,17 +6084,15 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/links";
-    request.body = "{\"default\":true,\"domain\":\"example.com\",\"subdomain\":\"mail\"}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/links");
+    request.setBody("{\"default\":true,\"domain\":\"example.com\",\"subdomain\":\"mail\"}");
+    request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6202,15 +6112,13 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/links";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/links");
+    request.addQueryParam("limit", "1");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6237,15 +6145,13 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/links/default";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("domain", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/links/default");
+    request.addQueryParam("domain", "test_string");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6269,15 +6175,13 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/links/subuser";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("username", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/links/subuser");
+    request.addQueryParam("username", "test_string");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6301,15 +6205,13 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "whitelabel/links/subuser";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("username", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("whitelabel/links/subuser");
+    request.addQueryParam("username", "test_string");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6329,13 +6231,13 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "whitelabel/links/{id}";
-    request.body = "{\"default\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("whitelabel/links/{id}");
+    request.setBody("{\"default\":true}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6355,12 +6257,12 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/links/{id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/links/{id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6380,12 +6282,12 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "whitelabel/links/{id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("whitelabel/links/{id}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6405,12 +6307,12 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/links/{id}/validate";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/links/{id}/validate");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
@@ -6434,13 +6336,13 @@ For more information, please see our [User Guide](https://sendgrid.com/docs/API_
   try {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/links/{link_id}/subuser";
-    request.body = "{\"username\":\"jane@example.com\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/links/{link_id}/subuser");
+    request.setBody("{\"username\":\"jane@example.com\"}");
     Response response = sg.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
   } catch (IOException ex) {
     throw ex;
   }
diff --git a/USE_CASES.md b/USE_CASES.md
index 76cec618..1bfb62f0 100644
--- a/USE_CASES.md
+++ b/USE_CASES.md
@@ -61,13 +61,13 @@ public class Example {
     SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
     Request request = new Request();
     try {
-      request.method = Method.POST;
-      request.endpoint = "mail/send";
-      request.body = mail.build();
+      request.setMethod(Method.POST);
+      request.setEndpoint("mail/send");
+      request.setBody(mail.build());
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -86,13 +86,13 @@ public class Example {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "mail/send";
-      request.body = "{\"personalizations\":[{\"to\":[{\"email\":\"test@example.com\"}],\"substitutions\":{\"-name-\":\"Example User\",\"-city-\":\"Denver\"},\"subject\":\"Hello World from the SendGrid Java Library!\"}],\"from\":{\"email\":\"test@example.com\"},\"content\":[{\"type\":\"text/html\",\"value\": \"I'm replacing the <strong>body tag</strong>\"}],\"template_id\": \"13b8f94f-bcae-4ec6-b752-70d6cb59f932\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("mail/send");
+      request.setBody("{\"personalizations\":[{\"to\":[{\"email\":\"test@example.com\"}],\"substitutions\":{\"-name-\":\"Example User\",\"-city-\":\"Denver\"},\"subject\":\"Hello World from the SendGrid Java Library!\"}],\"from\":{\"email\":\"test@example.com\"},\"content\":[{\"type\":\"text/html\",\"value\": \"I'm replacing the <strong>body tag</strong>\"}],\"template_id\": \"13b8f94f-bcae-4ec6-b752-70d6cb59f932\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/build.gradle b/build.gradle
index 324bbf30..b1523baf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,7 @@ buildscript {
 }
 
 dependencies {
-  compile 'com.sendgrid:java-http-client:2.3.4'
+  compile 'com.sendgrid:java-http-client:4.1.0'
   compile 'com.fasterxml.jackson.core:jackson-core:2.5.3'
   compile 'com.fasterxml.jackson.core:jackson-annotations:2.5.3'
   compile 'com.fasterxml.jackson.core:jackson-databind:2.5.3'
diff --git a/examples/accesssettings/accesssettings.java b/examples/accesssettings/accesssettings.java
index 5073484f..5008bafd 100644
--- a/examples/accesssettings/accesssettings.java
+++ b/examples/accesssettings/accesssettings.java
@@ -1,11 +1,9 @@
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import com.sendgrid.*;
+import com.sendgrid.Method;
+import com.sendgrid.Request;
+import com.sendgrid.Response;
+import com.sendgrid.SendGrid;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 //////////////////////////////////////////////////////////////////
 // Retrieve all recent access attempts
@@ -17,15 +15,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "access_settings/activity";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("limit", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("access_settings/activity");
+      request.addQueryParam("limit", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -42,13 +38,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "access_settings/whitelist";
-      request.body = "{\"ips\":[{\"ip\":\"192.168.1.1\"},{\"ip\":\"192.*.*.*\"},{\"ip\":\"192.168.1.3/32\"}]}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("access_settings/whitelist");
+      request.setBody("{\"ips\":[{\"ip\":\"192.168.1.1\"},{\"ip\":\"192.*.*.*\"},{\"ip\":\"192.168.1.3/32\"}]}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -65,12 +61,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "access_settings/whitelist";
+      request.setMethod(Method.GET);
+      request.setEndpoint("access_settings/whitelist");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -87,13 +83,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "access_settings/whitelist";
-      request.body = "{\"ids\":[1,2,3]}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("access_settings/whitelist");
+      request.setBody("{\"ids\":[1,2,3]}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -110,12 +106,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "access_settings/whitelist/{rule_id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("access_settings/whitelist/{rule_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -132,12 +128,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "access_settings/whitelist/{rule_id}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("access_settings/whitelist/{rule_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/alerts/alerts.java b/examples/alerts/alerts.java
index 2ad8f27b..a364c464 100644
--- a/examples/alerts/alerts.java
+++ b/examples/alerts/alerts.java
@@ -17,13 +17,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "alerts";
-      request.body = "{\"type\":\"stats_notification\",\"frequency\":\"daily\",\"email_to\":\"example@example.com\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("alerts");
+      request.setBody("{\"type\":\"stats_notification\",\"frequency\":\"daily\",\"email_to\":\"example@example.com\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -40,12 +40,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "alerts";
+      request.setMethod(Method.GET);
+      request.setEndpoint("alerts");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -62,13 +62,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "alerts/{alert_id}";
-      request.body = "{\"email_to\":\"example@example.com\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("alerts/{alert_id}");
+      request.setBody("{\"email_to\":\"example@example.com\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -85,12 +85,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "alerts/{alert_id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("alerts/{alert_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -107,12 +107,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "alerts/{alert_id}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("alerts/{alert_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/apikeys/apikeys.java b/examples/apikeys/apikeys.java
index 83e00032..d8e41909 100644
--- a/examples/apikeys/apikeys.java
+++ b/examples/apikeys/apikeys.java
@@ -1,11 +1,9 @@
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import com.sendgrid.*;
+import com.sendgrid.Method;
+import com.sendgrid.Request;
+import com.sendgrid.Response;
+import com.sendgrid.SendGrid;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 //////////////////////////////////////////////////////////////////
 // Create API keys
@@ -17,13 +15,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "api_keys";
-      request.body = "{\"sample\":\"data\",\"scopes\":[\"mail.send\",\"alerts.create\",\"alerts.read\"],\"name\":\"My API Key\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("api_keys");
+      request.setBody("{\"sample\":\"data\",\"scopes\":[\"mail.send\",\"alerts.create\",\"alerts.read\"],\"name\":\"My API Key\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -40,15 +38,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "api_keys";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("limit", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("api_keys");
+      request.addQueryParam("limit", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -65,13 +61,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PUT;
-      request.endpoint = "api_keys/{api_key_id}";
-      request.body = "{\"scopes\":[\"user.profile.read\",\"user.profile.update\"],\"name\":\"A New Hope\"}";
+      request.setMethod(Method.PUT);
+      request.setEndpoint("api_keys/{api_key_id}");
+      request.setBody("{\"scopes\":[\"user.profile.read\",\"user.profile.update\"],\"name\":\"A New Hope\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -88,13 +84,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "api_keys/{api_key_id}";
-      request.body = "{\"name\":\"A New Hope\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("api_keys/{api_key_id}");
+      request.setBody("{\"name\":\"A New Hope\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -111,12 +107,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "api_keys/{api_key_id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("api_keys/{api_key_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -133,12 +129,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "api_keys/{api_key_id}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("api_keys/{api_key_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/asm/asm.java b/examples/asm/asm.java
index e56a5676..a22c5100 100644
--- a/examples/asm/asm.java
+++ b/examples/asm/asm.java
@@ -1,11 +1,9 @@
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import com.sendgrid.*;
+import com.sendgrid.Method;
+import com.sendgrid.Request;
+import com.sendgrid.Response;
+import com.sendgrid.SendGrid;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 //////////////////////////////////////////////////////////////////
 // Create a new suppression group
@@ -17,13 +15,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "asm/groups";
-      request.body = "{\"is_default\":true,\"description\":\"Suggestions for products our users might like.\",\"name\":\"Product Suggestions\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("asm/groups");
+      request.setBody("{\"is_default\":true,\"description\":\"Suggestions for products our users might like.\",\"name\":\"Product Suggestions\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -40,15 +38,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "asm/groups";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("id", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("asm/groups");
+      request.addQueryParam("id", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -65,13 +61,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "asm/groups/{group_id}";
-      request.body = "{\"description\":\"Suggestions for items our users might like.\",\"name\":\"Item Suggestions\",\"id\":103}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("asm/groups/{group_id}");
+      request.setBody("{\"description\":\"Suggestions for items our users might like.\",\"name\":\"Item Suggestions\",\"id\":103}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -88,12 +84,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "asm/groups/{group_id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("asm/groups/{group_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -110,12 +106,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "asm/groups/{group_id}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("asm/groups/{group_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -132,13 +128,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "asm/groups/{group_id}/suppressions";
-      request.body = "{\"recipient_emails\":[\"test1@example.com\",\"test2@example.com\"]}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("asm/groups/{group_id}/suppressions");
+      request.setBody("{\"recipient_emails\":[\"test1@example.com\",\"test2@example.com\"]}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -155,12 +151,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "asm/groups/{group_id}/suppressions";
+      request.setMethod(Method.GET);
+      request.setEndpoint("asm/groups/{group_id}/suppressions");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -177,13 +173,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "asm/groups/{group_id}/suppressions/search";
-      request.body = "{\"recipient_emails\":[\"exists1@example.com\",\"exists2@example.com\",\"doesnotexists@example.com\"]}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("asm/groups/{group_id}/suppressions/search");
+      request.setBody("{\"recipient_emails\":[\"exists1@example.com\",\"exists2@example.com\",\"doesnotexists@example.com\"]}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -200,12 +196,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "asm/groups/{group_id}/suppressions/{email}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("asm/groups/{group_id}/suppressions/{email}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -222,12 +218,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "asm/suppressions";
+      request.setMethod(Method.GET);
+      request.setEndpoint("asm/suppressions");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -244,13 +240,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "asm/suppressions/global";
-      request.body = "{\"recipient_emails\":[\"test1@example.com\",\"test2@example.com\"]}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("asm/suppressions/global");
+      request.setBody("{\"recipient_emails\":[\"test1@example.com\",\"test2@example.com\"]}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -267,12 +263,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "asm/suppressions/global/{email}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("asm/suppressions/global/{email}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -289,12 +285,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "asm/suppressions/global/{email}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("asm/suppressions/global/{email}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -311,12 +307,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "asm/suppressions/{email}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("asm/suppressions/{email}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/browsers/browsers.java b/examples/browsers/browsers.java
index e6085aef..a4eca365 100644
--- a/examples/browsers/browsers.java
+++ b/examples/browsers/browsers.java
@@ -17,20 +17,18 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "browsers/stats";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("browsers", "test_string");
-      queryParams.put("limit", "test_string");
-      queryParams.put("offset", "test_string");
-      queryParams.put("start_date", "2016-01-01");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("browsers/stats");
+      request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("browsers", "test_string");
+      request.addQueryParam("limit", "test_string");
+      request.addQueryParam("offset", "test_string");
+      request.addQueryParam("start_date", "2016-01-01");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/campaigns/campaigns.java b/examples/campaigns/campaigns.java
index f6a051df..6345eca7 100644
--- a/examples/campaigns/campaigns.java
+++ b/examples/campaigns/campaigns.java
@@ -17,13 +17,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "campaigns";
-      request.body = "{\"custom_unsubscribe_url\":\"\",\"html_content\":\"<html><head><title></title></head><body><p>Check out our spring line!</p></body></html>\",\"list_ids\":[110,124],\"sender_id\":124451,\"subject\":\"New Products for Spring!\",\"plain_content\":\"Check out our spring line!\",\"suppression_group_id\":42,\"title\":\"March Newsletter\",\"segment_ids\":[110],\"categories\":[\"spring line\"],\"ip_pool\":\"marketing\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("campaigns");
+      request.setBody("{\"custom_unsubscribe_url\":\"\",\"html_content\":\"<html><head><title></title></head><body><p>Check out our spring line!</p></body></html>\",\"list_ids\":[110,124],\"sender_id\":124451,\"subject\":\"New Products for Spring!\",\"plain_content\":\"Check out our spring line!\",\"suppression_group_id\":42,\"title\":\"March Newsletter\",\"segment_ids\":[110],\"categories\":[\"spring line\"],\"ip_pool\":\"marketing\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -40,16 +40,14 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "campaigns";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("campaigns");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -66,13 +64,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "campaigns/{campaign_id}";
-      request.body = "{\"html_content\":\"<html><head><title></title></head><body><p>Check out our summer line!</p></body></html>\",\"subject\":\"New Products for Summer!\",\"title\":\"May Newsletter\",\"categories\":[\"summer line\"],\"plain_content\":\"Check out our summer line!\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("campaigns/{campaign_id}");
+      request.setBody("{\"html_content\":\"<html><head><title></title></head><body><p>Check out our summer line!</p></body></html>\",\"subject\":\"New Products for Summer!\",\"title\":\"May Newsletter\",\"categories\":[\"summer line\"],\"plain_content\":\"Check out our summer line!\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -89,12 +87,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "campaigns/{campaign_id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("campaigns/{campaign_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -111,12 +109,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "campaigns/{campaign_id}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("campaigns/{campaign_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -133,13 +131,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "campaigns/{campaign_id}/schedules";
-      request.body = "{\"send_at\":1489451436}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("campaigns/{campaign_id}/schedules");
+      request.setBody("{\"send_at\":1489451436}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -156,13 +154,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "campaigns/{campaign_id}/schedules";
-      request.body = "{\"send_at\":1489771528}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("campaigns/{campaign_id}/schedules");
+      request.setBody("{\"send_at\":1489771528}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -179,12 +177,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "campaigns/{campaign_id}/schedules";
+      request.setMethod(Method.GET);
+      request.setEndpoint("campaigns/{campaign_id}/schedules");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -201,12 +199,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "campaigns/{campaign_id}/schedules";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("campaigns/{campaign_id}/schedules");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -223,12 +221,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "campaigns/{campaign_id}/schedules/now";
+      request.setMethod(Method.POST);
+      request.setEndpoint("campaigns/{campaign_id}/schedules/now");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -245,13 +243,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "campaigns/{campaign_id}/schedules/test";
-      request.body = "{\"to\":\"your.email@example.com\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("campaigns/{campaign_id}/schedules/test");
+      request.setBody("{\"to\":\"your.email@example.com\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/categories/categories.java b/examples/categories/categories.java
index b6d2f507..7ac73822 100644
--- a/examples/categories/categories.java
+++ b/examples/categories/categories.java
@@ -17,17 +17,15 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "categories";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("category", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("categories");
+      request.addQueryParam("category", "test_string");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -44,20 +42,18 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "categories/stats";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("categories", "test_string");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("categories/stats");
+      request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("categories", "test_string");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -74,21 +70,19 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "categories/stats/sums";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("sort_by_metric", "test_string");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("sort_by_direction", "asc");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("categories/stats/sums");
+      request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("sort_by_metric", "test_string");
+      request.addQueryParam("offset", "1");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("sort_by_direction", "asc");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/clients/clients.java b/examples/clients/clients.java
index 1d48540c..9b755d86 100644
--- a/examples/clients/clients.java
+++ b/examples/clients/clients.java
@@ -17,17 +17,15 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "clients/stats";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("clients/stats");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("end_date", "2016-04-01");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -44,17 +42,15 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "clients/{client_type}/stats";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("clients/{client_type}/stats");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("end_date", "2016-04-01");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/contactdb/contactdb.java b/examples/contactdb/contactdb.java
index e57e06a9..1f971c8f 100644
--- a/examples/contactdb/contactdb.java
+++ b/examples/contactdb/contactdb.java
@@ -17,13 +17,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "contactdb/custom_fields";
-      request.body = "{\"type\":\"text\",\"name\":\"pet\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("contactdb/custom_fields");
+      request.setBody("{\"type\":\"text\",\"name\":\"pet\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -40,12 +40,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/custom_fields";
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/custom_fields");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -62,12 +62,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/custom_fields/{custom_field_id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/custom_fields/{custom_field_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -84,12 +84,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "contactdb/custom_fields/{custom_field_id}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("contactdb/custom_fields/{custom_field_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -106,13 +106,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "contactdb/lists";
-      request.body = "{\"name\":\"your list name\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("contactdb/lists");
+      request.setBody("{\"name\":\"your list name\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -129,12 +129,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/lists";
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/lists");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -151,13 +151,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "contactdb/lists";
-      request.body = "[1,2,3,4]";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("contactdb/lists");
+      request.setBody("[1,2,3,4]");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -174,16 +174,14 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "contactdb/lists/{list_id}";
-      request.body = "{\"name\":\"newlistname\"}";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("list_id", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("contactdb/lists/{list_id}");
+      request.setBody("{\"name\":\"newlistname\"}");
+      request.addQueryParam("list_id", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -200,15 +198,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/lists/{list_id}";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("list_id", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/lists/{list_id}");
+      request.addQueryParam("list_id", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -225,15 +221,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "contactdb/lists/{list_id}";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("delete_contacts", "true");
-      request.queryParams = queryParams;
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("contactdb/lists/{list_id}");
+      request.addQueryParam("delete_contacts", "true");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -250,13 +244,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "contactdb/lists/{list_id}/recipients";
-      request.body = "[\"recipient_id1\",\"recipient_id2\"]";
+      request.setMethod(Method.POST);
+      request.setEndpoint("contactdb/lists/{list_id}/recipients");
+      request.setBody("[\"recipient_id1\",\"recipient_id2\"]");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -273,17 +267,15 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/lists/{list_id}/recipients";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("page", "1");
-      queryParams.put("page_size", "1");
-      queryParams.put("list_id", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/lists/{list_id}/recipients");
+      request.addQueryParam("page", "1");
+      request.addQueryParam("page_size", "1");
+      request.addQueryParam("list_id", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -300,12 +292,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "contactdb/lists/{list_id}/recipients/{recipient_id}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("contactdb/lists/{list_id}/recipients/{recipient_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -322,16 +314,14 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "contactdb/lists/{list_id}/recipients/{recipient_id}";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("recipient_id", "1");
-      queryParams.put("list_id", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("contactdb/lists/{list_id}/recipients/{recipient_id}");
+      request.addQueryParam("recipient_id", "1");
+      request.addQueryParam("list_id", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -348,13 +338,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "contactdb/recipients";
-      request.body = "[{\"first_name\":\"Guy\",\"last_name\":\"Jones\",\"email\":\"jones@example.com\"}]";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("contactdb/recipients");
+      request.setBody("[{\"first_name\":\"Guy\",\"last_name\":\"Jones\",\"email\":\"jones@example.com\"}]");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -371,13 +361,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "contactdb/recipients";
-      request.body = "[{\"age\":25,\"last_name\":\"User\",\"email\":\"example@example.com\",\"first_name\":\"\"},{\"age\":25,\"last_name\":\"User\",\"email\":\"example2@example.com\",\"first_name\":\"Example\"}]";
+      request.setMethod(Method.POST);
+      request.setEndpoint("contactdb/recipients");
+      request.setBody("[{\"age\":25,\"last_name\":\"User\",\"email\":\"example@example.com\",\"first_name\":\"\"},{\"age\":25,\"last_name\":\"User\",\"email\":\"example2@example.com\",\"first_name\":\"Example\"}]");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -394,16 +384,14 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/recipients";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("page", "1");
-      queryParams.put("page_size", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/recipients");
+      request.addQueryParam("page", "1");
+      request.addQueryParam("page_size", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -420,13 +408,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "contactdb/recipients";
-      request.body = "[\"recipient_id1\",\"recipient_id2\"]";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("contactdb/recipients");
+      request.setBody("[\"recipient_id1\",\"recipient_id2\"]");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -443,12 +431,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/recipients/billable_count";
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/recipients/billable_count");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -465,12 +453,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/recipients/count";
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/recipients/count");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -487,15 +475,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/recipients/search";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("{field_name}", "test_string");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/recipients/search");
+      request.addQueryParam("{field_name}", "test_string");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -512,12 +498,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/recipients/{recipient_id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/recipients/{recipient_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -534,12 +520,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "contactdb/recipients/{recipient_id}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("contactdb/recipients/{recipient_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -556,12 +542,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/recipients/{recipient_id}/lists";
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/recipients/{recipient_id}/lists");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -578,12 +564,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/reserved_fields";
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/reserved_fields");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -600,13 +586,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "contactdb/segments";
-      request.body = "{\"conditions\":[{\"operator\":\"eq\",\"field\":\"last_name\",\"and_or\":\"\",\"value\":\"Miller\"},{\"operator\":\"gt\",\"field\":\"last_clicked\",\"and_or\":\"and\",\"value\":\"01/02/2015\"},{\"operator\":\"eq\",\"field\":\"clicks.campaign_identifier\",\"and_or\":\"or\",\"value\":\"513\"}],\"name\":\"Last Name Miller\",\"list_id\":4}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("contactdb/segments");
+      request.setBody("{\"conditions\":[{\"operator\":\"eq\",\"field\":\"last_name\",\"and_or\":\"\",\"value\":\"Miller\"},{\"operator\":\"gt\",\"field\":\"last_clicked\",\"and_or\":\"and\",\"value\":\"01/02/2015\"},{\"operator\":\"eq\",\"field\":\"clicks.campaign_identifier\",\"and_or\":\"or\",\"value\":\"513\"}],\"name\":\"Last Name Miller\",\"list_id\":4}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -623,12 +609,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/segments";
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/segments");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -645,16 +631,14 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "contactdb/segments/{segment_id}";
-      request.body = "{\"conditions\":[{\"operator\":\"eq\",\"field\":\"last_name\",\"and_or\":\"\",\"value\":\"Miller\"}],\"name\":\"The Millers\",\"list_id\":5}";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("segment_id", "test_string");
-      request.queryParams = queryParams;
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("contactdb/segments/{segment_id}");
+      request.setBody("{\"conditions\":[{\"operator\":\"eq\",\"field\":\"last_name\",\"and_or\":\"\",\"value\":\"Miller\"}],\"name\":\"The Millers\",\"list_id\":5}");
+      request.addQueryParam("segment_id", "test_string");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -671,15 +655,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/segments/{segment_id}";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("segment_id", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/segments/{segment_id}");
+      request.addQueryParam("segment_id", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -696,15 +678,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "contactdb/segments/{segment_id}";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("delete_contacts", "true");
-      request.queryParams = queryParams;
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("contactdb/segments/{segment_id}");
+      request.addQueryParam("delete_contacts", "true");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -721,16 +701,14 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "contactdb/segments/{segment_id}/recipients";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("page", "1");
-      queryParams.put("page_size", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("contactdb/segments/{segment_id}/recipients");
+      request.addQueryParam("page", "1");
+      request.addQueryParam("page_size", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/devices/devices.java b/examples/devices/devices.java
index 5dbe9cd5..7c253eac 100644
--- a/examples/devices/devices.java
+++ b/examples/devices/devices.java
@@ -17,19 +17,17 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "devices/stats";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("devices/stats");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/geo/geo.java b/examples/geo/geo.java
index 48309368..6b74fda9 100644
--- a/examples/geo/geo.java
+++ b/examples/geo/geo.java
@@ -17,20 +17,18 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "geo/stats";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("country", "US");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("geo/stats");
+      request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("country", "US");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
+      request.addQueryParam("start_date", "2016-01-01");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/helpers/mail/Example.java b/examples/helpers/mail/Example.java
index f40fac05..d595d0d3 100644
--- a/examples/helpers/mail/Example.java
+++ b/examples/helpers/mail/Example.java
@@ -230,13 +230,13 @@ public static void baselineExample() throws IOException {
     Request request = new Request();
     Mail helloWorld = buildHelloEmail();
     try {
-      request.method = Method.POST;
-      request.endpoint = "mail/send";
-      request.body = helloWorld.build();
+      request.setMethod(Method.POST);
+      request.setEndpoint("mail/send");
+      request.setBody(helloWorld.build());
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -249,13 +249,13 @@ public static void kitchenSinkExample() throws IOException {
     Request request = new Request();
     Mail kitchenSink = buildKitchenSink();
     try {
-      request.method = Method.POST;
-      request.endpoint = "mail/send";
-      request.body = kitchenSink.build();
+      request.setMethod(Method.POST);
+      request.setEndpoint("mail/send");
+      request.setBody(kitchenSink.build());
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/ips/ips.java b/examples/ips/ips.java
index b9dfdbef..55c97644 100644
--- a/examples/ips/ips.java
+++ b/examples/ips/ips.java
@@ -17,19 +17,17 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "ips";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("subuser", "test_string");
-      queryParams.put("ip", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("exclude_whitelabels", "true");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("ips");
+      request.addQueryParam("subuser", "test_string");
+      request.addQueryParam("ip", "test_string");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("exclude_whitelabels", "true");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -46,12 +44,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "ips/assigned";
+      request.setMethod(Method.GET);
+      request.setEndpoint("ips/assigned");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -68,13 +66,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "ips/pools";
-      request.body = "{\"name\":\"marketing\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("ips/pools");
+      request.setBody("{\"name\":\"marketing\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -91,12 +89,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "ips/pools";
+      request.setMethod(Method.GET);
+      request.setEndpoint("ips/pools");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -113,13 +111,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PUT;
-      request.endpoint = "ips/pools/{pool_name}";
-      request.body = "{\"name\":\"new_pool_name\"}";
+      request.setMethod(Method.PUT);
+      request.setEndpoint("ips/pools/{pool_name}");
+      request.setBody("{\"name\":\"new_pool_name\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -136,12 +134,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "ips/pools/{pool_name}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("ips/pools/{pool_name}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -158,12 +156,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "ips/pools/{pool_name}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("ips/pools/{pool_name}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -180,13 +178,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "ips/pools/{pool_name}/ips";
-      request.body = "{\"ip\":\"0.0.0.0\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("ips/pools/{pool_name}/ips");
+      request.setBody("{\"ip\":\"0.0.0.0\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -203,12 +201,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "ips/pools/{pool_name}/ips/{ip}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("ips/pools/{pool_name}/ips/{ip}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -225,13 +223,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "ips/warmup";
-      request.body = "{\"ip\":\"0.0.0.0\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("ips/warmup");
+      request.setBody("{\"ip\":\"0.0.0.0\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -248,12 +246,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "ips/warmup";
+      request.setMethod(Method.GET);
+      request.setEndpoint("ips/warmup");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -270,12 +268,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "ips/warmup/{ip_address}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("ips/warmup/{ip_address}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -292,12 +290,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "ips/warmup/{ip_address}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("ips/warmup/{ip_address}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -314,12 +312,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "ips/{ip_address}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("ips/{ip_address}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/mail/mail.java b/examples/mail/mail.java
index bb856633..52df8be6 100644
--- a/examples/mail/mail.java
+++ b/examples/mail/mail.java
@@ -17,12 +17,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "mail/batch";
+      request.setMethod(Method.POST);
+      request.setEndpoint("mail/batch");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -39,12 +39,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "mail/batch/{batch_id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("mail/batch/{batch_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -62,13 +62,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "mail/send";
-      request.body = "{\"custom_args\":{\"New Argument 1\":\"New Value 1\",\"activationAttempt\":\"1\",\"customerAccountNumber\":\"[CUSTOMER ACCOUNT NUMBER GOES HERE]\"},\"from\":{\"email\":\"sam.smith@example.com\",\"name\":\"Sam Smith\"},\"attachments\":[{\"name\":\"file1\",\"filename\":\"file1.jpg\",\"content\":\"[BASE64 encoded content block here]\",\"disposition\":\"inline\",\"content_id\":\"ii_139db99fdb5c3704\",\"type\":\"jpg\"}],\"personalizations\":[{\"to\":[{\"email\":\"john.doe@example.com\",\"name\":\"John Doe\"}],\"cc\":[{\"email\":\"jane.doe@example.com\",\"name\":\"Jane Doe\"}],\"bcc\":[{\"email\":\"sam.doe@example.com\",\"name\":\"Sam Doe\"}],\"custom_args\":{\"New Argument 1\":\"New Value 1\",\"activationAttempt\":\"1\",\"customerAccountNumber\":\"[CUSTOMER ACCOUNT NUMBER GOES HERE]\"},\"headers\":{\"X-Accept-Language\":\"en\",\"X-Mailer\":\"MyApp\"},\"send_at\":1409348513,\"substitutions\":{\"type\":\"object\",\"id\":\"substitutions\"},\"subject\":\"Hello, World!\"}],\"subject\":\"Hello, World!\",\"ip_pool_name\":\"[YOUR POOL NAME GOES HERE]\",\"content\":[{\"type\":\"text/html\",\"value\":\"<html><p>Hello, world!</p><img src=[CID GOES HERE]></img></html>\"}],\"headers\":{},\"asm\":{\"groups_to_display\":[1,2,3],\"group_id\":1},\"batch_id\":\"[YOUR BATCH ID GOES HERE]\",\"tracking_settings\":{\"subscription_tracking\":{\"text\":\"If you would like to unsubscribe and stop receiveing these emails <% click here %>.\",\"enable\":true,\"html\":\"If you would like to unsubscribe and stop receiving these emails <% clickhere %>.\",\"substitution_tag\":\"<%click here%>\"},\"open_tracking\":{\"enable\":true,\"substitution_tag\":\"%opentrack\"},\"click_tracking\":{\"enable\":true,\"enable_text\":true},\"ganalytics\":{\"utm_campaign\":\"[NAME OF YOUR REFERRER SOURCE]\",\"enable\":true,\"utm_name\":\"[NAME OF YOUR CAMPAIGN]\",\"utm_term\":\"[IDENTIFY PAID KEYWORDS HERE]\",\"utm_content\":\"[USE THIS SPACE TO DIFFERENTIATE YOUR EMAIL FROM ADS]\",\"utm_medium\":\"[NAME OF YOUR MARKETING MEDIUM e.g. email]\"}},\"mail_settings\":{\"footer\":{\"text\":\"Thanks,/n The SendGrid Team\",\"enable\":true,\"html\":\"<p>Thanks</br>The SendGrid Team</p>\"},\"spam_check\":{\"threshold\":3,\"post_to_url\":\"http://example.com/compliance\",\"enable\":true},\"bypass_list_management\":{\"enable\":true},\"sandbox_mode\":{\"enable\":false},\"bcc\":{\"enable\":true,\"email\":\"ben.doe@example.com\"}},\"reply_to\":{\"email\":\"sam.smith@example.com\",\"name\":\"Sam Smith\"},\"sections\":{\"section\":{\":sectionName2\":\"section 2 text\",\":sectionName1\":\"section 1 text\"}},\"template_id\":\"[YOUR TEMPLATE ID GOES HERE]\",\"categories\":[\"category1\",\"category2\"],\"send_at\":1409348513}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("mail/send");
+      request.setBody("{\"custom_args\":{\"New Argument 1\":\"New Value 1\",\"activationAttempt\":\"1\",\"customerAccountNumber\":\"[CUSTOMER ACCOUNT NUMBER GOES HERE]\"},\"from\":{\"email\":\"sam.smith@example.com\",\"name\":\"Sam Smith\"},\"attachments\":[{\"name\":\"file1\",\"filename\":\"file1.jpg\",\"content\":\"[BASE64 encoded content block here]\",\"disposition\":\"inline\",\"content_id\":\"ii_139db99fdb5c3704\",\"type\":\"jpg\"}],\"personalizations\":[{\"to\":[{\"email\":\"john.doe@example.com\",\"name\":\"John Doe\"}],\"cc\":[{\"email\":\"jane.doe@example.com\",\"name\":\"Jane Doe\"}],\"bcc\":[{\"email\":\"sam.doe@example.com\",\"name\":\"Sam Doe\"}],\"custom_args\":{\"New Argument 1\":\"New Value 1\",\"activationAttempt\":\"1\",\"customerAccountNumber\":\"[CUSTOMER ACCOUNT NUMBER GOES HERE]\"},\"headers\":{\"X-Accept-Language\":\"en\",\"X-Mailer\":\"MyApp\"},\"send_at\":1409348513,\"substitutions\":{\"type\":\"object\",\"id\":\"substitutions\"},\"subject\":\"Hello, World!\"}],\"subject\":\"Hello, World!\",\"ip_pool_name\":\"[YOUR POOL NAME GOES HERE]\",\"content\":[{\"type\":\"text/html\",\"value\":\"<html><p>Hello, world!</p><img src=[CID GOES HERE]></img></html>\"}],\"headers\":{},\"asm\":{\"groups_to_display\":[1,2,3],\"group_id\":1},\"batch_id\":\"[YOUR BATCH ID GOES HERE]\",\"tracking_settings\":{\"subscription_tracking\":{\"text\":\"If you would like to unsubscribe and stop receiveing these emails <% click here %>.\",\"enable\":true,\"html\":\"If you would like to unsubscribe and stop receiving these emails <% clickhere %>.\",\"substitution_tag\":\"<%click here%>\"},\"open_tracking\":{\"enable\":true,\"substitution_tag\":\"%opentrack\"},\"click_tracking\":{\"enable\":true,\"enable_text\":true},\"ganalytics\":{\"utm_campaign\":\"[NAME OF YOUR REFERRER SOURCE]\",\"enable\":true,\"utm_name\":\"[NAME OF YOUR CAMPAIGN]\",\"utm_term\":\"[IDENTIFY PAID KEYWORDS HERE]\",\"utm_content\":\"[USE THIS SPACE TO DIFFERENTIATE YOUR EMAIL FROM ADS]\",\"utm_medium\":\"[NAME OF YOUR MARKETING MEDIUM e.g. email]\"}},\"mail_settings\":{\"footer\":{\"text\":\"Thanks,/n The SendGrid Team\",\"enable\":true,\"html\":\"<p>Thanks</br>The SendGrid Team</p>\"},\"spam_check\":{\"threshold\":3,\"post_to_url\":\"http://example.com/compliance\",\"enable\":true},\"bypass_list_management\":{\"enable\":true},\"sandbox_mode\":{\"enable\":false},\"bcc\":{\"enable\":true,\"email\":\"ben.doe@example.com\"}},\"reply_to\":{\"email\":\"sam.smith@example.com\",\"name\":\"Sam Smith\"},\"sections\":{\"section\":{\":sectionName2\":\"section 2 text\",\":sectionName1\":\"section 1 text\"}},\"template_id\":\"[YOUR TEMPLATE ID GOES HERE]\",\"categories\":[\"category1\",\"category2\"],\"send_at\":1409348513}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/mailboxproviders/mailboxproviders.java b/examples/mailboxproviders/mailboxproviders.java
index 6b412955..4e0c6a06 100644
--- a/examples/mailboxproviders/mailboxproviders.java
+++ b/examples/mailboxproviders/mailboxproviders.java
@@ -17,20 +17,18 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "mailbox_providers/stats";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("mailbox_providers", "test_string");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("mailbox_providers/stats");
+      request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("mailbox_providers", "test_string");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
+      request.addQueryParam("start_date", "2016-01-01");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/mailsettings/mailsettings.java b/examples/mailsettings/mailsettings.java
index b74b48bf..d42ffd2a 100644
--- a/examples/mailsettings/mailsettings.java
+++ b/examples/mailsettings/mailsettings.java
@@ -17,16 +17,14 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "mail_settings";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("mail_settings");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -43,13 +41,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "mail_settings/address_whitelist";
-      request.body = "{\"list\":[\"email1@example.com\",\"example.com\"],\"enabled\":true}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("mail_settings/address_whitelist");
+      request.setBody("{\"list\":[\"email1@example.com\",\"example.com\"],\"enabled\":true}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -66,12 +64,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "mail_settings/address_whitelist";
+      request.setMethod(Method.GET);
+      request.setEndpoint("mail_settings/address_whitelist");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -88,13 +86,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "mail_settings/bcc";
-      request.body = "{\"enabled\":false,\"email\":\"email@example.com\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("mail_settings/bcc");
+      request.setBody("{\"enabled\":false,\"email\":\"email@example.com\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -111,12 +109,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "mail_settings/bcc";
+      request.setMethod(Method.GET);
+      request.setEndpoint("mail_settings/bcc");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -133,13 +131,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "mail_settings/bounce_purge";
-      request.body = "{\"hard_bounces\":5,\"soft_bounces\":5,\"enabled\":true}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("mail_settings/bounce_purge");
+      request.setBody("{\"hard_bounces\":5,\"soft_bounces\":5,\"enabled\":true}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -156,12 +154,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "mail_settings/bounce_purge";
+      request.setMethod(Method.GET);
+      request.setEndpoint("mail_settings/bounce_purge");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -178,13 +176,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "mail_settings/footer";
-      request.body = "{\"html_content\":\"...\",\"enabled\":true,\"plain_content\":\"...\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("mail_settings/footer");
+      request.setBody("{\"html_content\":\"...\",\"enabled\":true,\"plain_content\":\"...\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -201,12 +199,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "mail_settings/footer";
+      request.setMethod(Method.GET);
+      request.setEndpoint("mail_settings/footer");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -223,13 +221,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "mail_settings/forward_bounce";
-      request.body = "{\"enabled\":true,\"email\":\"example@example.com\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("mail_settings/forward_bounce");
+      request.setBody("{\"enabled\":true,\"email\":\"example@example.com\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -246,12 +244,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "mail_settings/forward_bounce";
+      request.setMethod(Method.GET);
+      request.setEndpoint("mail_settings/forward_bounce");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -268,13 +266,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "mail_settings/forward_spam";
-      request.body = "{\"enabled\":false,\"email\":\"\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("mail_settings/forward_spam");
+      request.setBody("{\"enabled\":false,\"email\":\"\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -291,12 +289,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "mail_settings/forward_spam";
+      request.setMethod(Method.GET);
+      request.setEndpoint("mail_settings/forward_spam");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -313,13 +311,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "mail_settings/plain_content";
-      request.body = "{\"enabled\":false}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("mail_settings/plain_content");
+      request.setBody("{\"enabled\":false}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -336,12 +334,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "mail_settings/plain_content";
+      request.setMethod(Method.GET);
+      request.setEndpoint("mail_settings/plain_content");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -358,13 +356,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "mail_settings/spam_check";
-      request.body = "{\"url\":\"url\",\"max_score\":5,\"enabled\":true}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("mail_settings/spam_check");
+      request.setBody("{\"url\":\"url\",\"max_score\":5,\"enabled\":true}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -381,12 +379,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "mail_settings/spam_check";
+      request.setMethod(Method.GET);
+      request.setEndpoint("mail_settings/spam_check");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -403,13 +401,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "mail_settings/template";
-      request.body = "{\"html_content\":\"<% body %>\",\"enabled\":true}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("mail_settings/template");
+      request.setBody("{\"html_content\":\"<% body %>\",\"enabled\":true}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -426,12 +424,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "mail_settings/template";
+      request.setMethod(Method.GET);
+      request.setEndpoint("mail_settings/template");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/partnersettings/partnersettings.java b/examples/partnersettings/partnersettings.java
index b63508a9..b4364bb9 100644
--- a/examples/partnersettings/partnersettings.java
+++ b/examples/partnersettings/partnersettings.java
@@ -17,16 +17,14 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "partner_settings";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("partner_settings");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -43,13 +41,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "partner_settings/new_relic";
-      request.body = "{\"enable_subuser_statistics\":true,\"enabled\":true,\"license_key\":\"\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("partner_settings/new_relic");
+      request.setBody("{\"enable_subuser_statistics\":true,\"enabled\":true,\"license_key\":\"\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -66,12 +64,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "partner_settings/new_relic";
+      request.setMethod(Method.GET);
+      request.setEndpoint("partner_settings/new_relic");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/scopes/scopes.java b/examples/scopes/scopes.java
index f892f6ad..69d2db5d 100644
--- a/examples/scopes/scopes.java
+++ b/examples/scopes/scopes.java
@@ -17,12 +17,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "scopes";
+      request.setMethod(Method.GET);
+      request.setEndpoint("scopes");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/senders/senders.java b/examples/senders/senders.java
index f101b43f..d81630da 100644
--- a/examples/senders/senders.java
+++ b/examples/senders/senders.java
@@ -17,13 +17,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "senders";
-      request.body = "{\"city\":\"Denver\",\"from\":{\"email\":\"from@example.com\",\"name\":\"Example INC\"},\"zip\":\"80202\",\"country\":\"United States\",\"state\":\"Colorado\",\"address_2\":\"Apt. 456\",\"address\":\"123 Elm St.\",\"reply_to\":{\"email\":\"replyto@example.com\",\"name\":\"Example INC\"},\"nickname\":\"My Sender ID\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("senders");
+      request.setBody("{\"city\":\"Denver\",\"from\":{\"email\":\"from@example.com\",\"name\":\"Example INC\"},\"zip\":\"80202\",\"country\":\"United States\",\"state\":\"Colorado\",\"address_2\":\"Apt. 456\",\"address\":\"123 Elm St.\",\"reply_to\":{\"email\":\"replyto@example.com\",\"name\":\"Example INC\"},\"nickname\":\"My Sender ID\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -40,12 +40,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "senders";
+      request.setMethod(Method.GET);
+      request.setEndpoint("senders");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -62,13 +62,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "senders/{sender_id}";
-      request.body = "{\"city\":\"Denver\",\"from\":{\"email\":\"from@example.com\",\"name\":\"Example INC\"},\"zip\":\"80202\",\"country\":\"United States\",\"state\":\"Colorado\",\"address_2\":\"Apt. 456\",\"address\":\"123 Elm St.\",\"reply_to\":{\"email\":\"replyto@example.com\",\"name\":\"Example INC\"},\"nickname\":\"My Sender ID\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("senders/{sender_id}");
+      request.setBody("{\"city\":\"Denver\",\"from\":{\"email\":\"from@example.com\",\"name\":\"Example INC\"},\"zip\":\"80202\",\"country\":\"United States\",\"state\":\"Colorado\",\"address_2\":\"Apt. 456\",\"address\":\"123 Elm St.\",\"reply_to\":{\"email\":\"replyto@example.com\",\"name\":\"Example INC\"},\"nickname\":\"My Sender ID\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -85,12 +85,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "senders/{sender_id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("senders/{sender_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -107,12 +107,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "senders/{sender_id}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("senders/{sender_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -129,12 +129,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "senders/{sender_id}/resend_verification";
+      request.setMethod(Method.POST);
+      request.setEndpoint("senders/{sender_id}/resend_verification");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/stats/stats.java b/examples/stats/stats.java
index cc108212..1dbe5c25 100644
--- a/examples/stats/stats.java
+++ b/examples/stats/stats.java
@@ -17,19 +17,17 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "stats";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("stats");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/subusers/subusers.java b/examples/subusers/subusers.java
index 6a9500be..6959ac8d 100644
--- a/examples/subusers/subusers.java
+++ b/examples/subusers/subusers.java
@@ -17,13 +17,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "subusers";
-      request.body = "{\"username\":\"John@example.com\",\"ips\":[\"1.1.1.1\",\"2.2.2.2\"],\"password\":\"johns_password\",\"email\":\"John@example.com\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("subusers");
+      request.setBody("{\"username\":\"John@example.com\",\"ips\":[\"1.1.1.1\",\"2.2.2.2\"],\"password\":\"johns_password\",\"email\":\"John@example.com\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -40,17 +40,15 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "subusers";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("username", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("subusers");
+      request.addQueryParam("username", "test_string");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -67,15 +65,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "subusers/reputations";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("usernames", "test_string");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("subusers/reputations");
+      request.addQueryParam("usernames", "test_string");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -92,20 +88,18 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "subusers/stats";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("subusers", "test_string");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("subusers/stats");
+      request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("subusers", "test_string");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -122,20 +116,18 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "subusers/stats/monthly";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("subuser", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("sort_by_metric", "test_string");
-      queryParams.put("offset", "1");
-      queryParams.put("date", "test_string");
-      queryParams.put("sort_by_direction", "asc");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("subusers/stats/monthly");
+      request.addQueryParam("subuser", "test_string");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("sort_by_metric", "test_string");
+      request.addQueryParam("offset", "1");
+      request.addQueryParam("date", "test_string");
+      request.addQueryParam("sort_by_direction", "asc");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -152,21 +144,19 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "subusers/stats/sums";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("sort_by_metric", "test_string");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("sort_by_direction", "asc");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("subusers/stats/sums");
+      request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("sort_by_metric", "test_string");
+      request.addQueryParam("offset", "1");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("sort_by_direction", "asc");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -183,13 +173,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "subusers/{subuser_name}";
-      request.body = "{\"disabled\":false}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("subusers/{subuser_name}");
+      request.setBody("{\"disabled\":false}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -206,12 +196,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "subusers/{subuser_name}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("subusers/{subuser_name}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -228,13 +218,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PUT;
-      request.endpoint = "subusers/{subuser_name}/ips";
-      request.body = "[\"127.0.0.1\"]";
+      request.setMethod(Method.PUT);
+      request.setEndpoint("subusers/{subuser_name}/ips");
+      request.setBody("[\"127.0.0.1\"]");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -251,13 +241,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PUT;
-      request.endpoint = "subusers/{subuser_name}/monitor";
-      request.body = "{\"frequency\":500,\"email\":\"example@example.com\"}";
+      request.setMethod(Method.PUT);
+      request.setEndpoint("subusers/{subuser_name}/monitor");
+      request.setBody("{\"frequency\":500,\"email\":\"example@example.com\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -274,13 +264,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "subusers/{subuser_name}/monitor";
-      request.body = "{\"frequency\":50000,\"email\":\"example@example.com\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("subusers/{subuser_name}/monitor");
+      request.setBody("{\"frequency\":50000,\"email\":\"example@example.com\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -297,12 +287,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "subusers/{subuser_name}/monitor";
+      request.setMethod(Method.GET);
+      request.setEndpoint("subusers/{subuser_name}/monitor");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -319,12 +309,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "subusers/{subuser_name}/monitor";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("subusers/{subuser_name}/monitor");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -341,19 +331,17 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "subusers/{subuser_name}/stats/monthly";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("date", "test_string");
-      queryParams.put("sort_by_direction", "asc");
-      queryParams.put("limit", "1");
-      queryParams.put("sort_by_metric", "test_string");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("subusers/{subuser_name}/stats/monthly");
+      request.addQueryParam("date", "test_string");
+      request.addQueryParam("sort_by_direction", "asc");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("sort_by_metric", "test_string");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/suppression/suppression.java b/examples/suppression/suppression.java
index c5dbeaaa..049581a8 100644
--- a/examples/suppression/suppression.java
+++ b/examples/suppression/suppression.java
@@ -17,18 +17,16 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "suppression/blocks";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("start_time", "1");
-      queryParams.put("limit", "1");
-      queryParams.put("end_time", "1");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("suppression/blocks");
+      request.addQueryParam("start_time", "1");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("end_time", "1");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -45,13 +43,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "suppression/blocks";
-      request.body = "{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("suppression/blocks");
+      request.setBody("{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -68,12 +66,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "suppression/blocks/{email}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("suppression/blocks/{email}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -90,12 +88,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "suppression/blocks/{email}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("suppression/blocks/{email}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -112,16 +110,14 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "suppression/bounces";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("start_time", "1");
-      queryParams.put("end_time", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("suppression/bounces");
+      request.addQueryParam("start_time", "1");
+      request.addQueryParam("end_time", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -138,13 +134,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "suppression/bounces";
-      request.body = "{\"emails\":[\"example@example.com\",\"example2@example.com\"],\"delete_all\":true}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("suppression/bounces");
+      request.setBody("{\"emails\":[\"example@example.com\",\"example2@example.com\"],\"delete_all\":true}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -161,12 +157,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "suppression/bounces/{email}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("suppression/bounces/{email}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -183,15 +179,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "suppression/bounces/{email}";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("email_address", "example@example.com");
-      request.queryParams = queryParams;
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("suppression/bounces/{email}");
+      request.addQueryParam("email_address", "example@example.com");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -208,18 +202,16 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "suppression/invalid_emails";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("start_time", "1");
-      queryParams.put("limit", "1");
-      queryParams.put("end_time", "1");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("suppression/invalid_emails");
+      request.addQueryParam("start_time", "1");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("end_time", "1");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -236,13 +228,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "suppression/invalid_emails";
-      request.body = "{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("suppression/invalid_emails");
+      request.setBody("{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -259,12 +251,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "suppression/invalid_emails/{email}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("suppression/invalid_emails/{email}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -281,12 +273,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "suppression/invalid_emails/{email}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("suppression/invalid_emails/{email}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -303,12 +295,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "suppression/spam_report/{email}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("suppression/spam_report/{email}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -325,12 +317,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "suppression/spam_report/{email}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("suppression/spam_report/{email}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -347,18 +339,16 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "suppression/spam_reports";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("start_time", "1");
-      queryParams.put("limit", "1");
-      queryParams.put("end_time", "1");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("suppression/spam_reports");
+      request.addQueryParam("start_time", "1");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("end_time", "1");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -375,13 +365,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "suppression/spam_reports";
-      request.body = "{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("suppression/spam_reports");
+      request.setBody("{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -398,18 +388,16 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "suppression/unsubscribes";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("start_time", "1");
-      queryParams.put("limit", "1");
-      queryParams.put("end_time", "1");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("suppression/unsubscribes");
+      request.addQueryParam("start_time", "1");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("end_time", "1");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/templates/templates.java b/examples/templates/templates.java
index c5ff8879..a16c4bed 100644
--- a/examples/templates/templates.java
+++ b/examples/templates/templates.java
@@ -17,13 +17,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "templates";
-      request.body = "{\"name\":\"example_name\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("templates");
+      request.setBody("{\"name\":\"example_name\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -40,12 +40,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "templates";
+      request.setMethod(Method.GET);
+      request.setEndpoint("templates");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -62,13 +62,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "templates/{template_id}";
-      request.body = "{\"name\":\"new_example_name\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("templates/{template_id}");
+      request.setBody("{\"name\":\"new_example_name\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -85,12 +85,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "templates/{template_id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("templates/{template_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -107,12 +107,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "templates/{template_id}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("templates/{template_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -129,13 +129,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "templates/{template_id}/versions";
-      request.body = "{\"name\":\"example_version_name\",\"html_content\":\"<%body%>\",\"plain_content\":\"<%body%>\",\"active\":1,\"template_id\":\"ddb96bbc-9b92-425e-8979-99464621b543\",\"subject\":\"<%subject%>\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("templates/{template_id}/versions");
+      request.setBody("{\"name\":\"example_version_name\",\"html_content\":\"<%body%>\",\"plain_content\":\"<%body%>\",\"active\":1,\"template_id\":\"ddb96bbc-9b92-425e-8979-99464621b543\",\"subject\":\"<%subject%>\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -152,13 +152,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "templates/{template_id}/versions/{version_id}";
-      request.body = "{\"active\":1,\"html_content\":\"<%body%>\",\"subject\":\"<%subject%>\",\"name\":\"updated_example_name\",\"plain_content\":\"<%body%>\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("templates/{template_id}/versions/{version_id}");
+      request.setBody("{\"active\":1,\"html_content\":\"<%body%>\",\"subject\":\"<%subject%>\",\"name\":\"updated_example_name\",\"plain_content\":\"<%body%>\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -175,12 +175,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "templates/{template_id}/versions/{version_id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("templates/{template_id}/versions/{version_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -197,12 +197,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "templates/{template_id}/versions/{version_id}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("templates/{template_id}/versions/{version_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -219,12 +219,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "templates/{template_id}/versions/{version_id}/activate";
+      request.setMethod(Method.POST);
+      request.setEndpoint("templates/{template_id}/versions/{version_id}/activate");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/trackingsettings/trackingsettings.java b/examples/trackingsettings/trackingsettings.java
index 82deebe4..17b8d0d0 100644
--- a/examples/trackingsettings/trackingsettings.java
+++ b/examples/trackingsettings/trackingsettings.java
@@ -17,16 +17,14 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "tracking_settings";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("tracking_settings");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -43,13 +41,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "tracking_settings/click";
-      request.body = "{\"enabled\":true}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("tracking_settings/click");
+      request.setBody("{\"enabled\":true}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -66,12 +64,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "tracking_settings/click";
+      request.setMethod(Method.GET);
+      request.setEndpoint("tracking_settings/click");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -88,13 +86,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "tracking_settings/google_analytics";
-      request.body = "{\"utm_campaign\":\"website\",\"utm_term\":\"\",\"utm_content\":\"\",\"enabled\":true,\"utm_source\":\"sendgrid.com\",\"utm_medium\":\"email\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("tracking_settings/google_analytics");
+      request.setBody("{\"utm_campaign\":\"website\",\"utm_term\":\"\",\"utm_content\":\"\",\"enabled\":true,\"utm_source\":\"sendgrid.com\",\"utm_medium\":\"email\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -111,12 +109,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "tracking_settings/google_analytics";
+      request.setMethod(Method.GET);
+      request.setEndpoint("tracking_settings/google_analytics");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -133,13 +131,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "tracking_settings/open";
-      request.body = "{\"enabled\":true}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("tracking_settings/open");
+      request.setBody("{\"enabled\":true}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -156,12 +154,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "tracking_settings/open";
+      request.setMethod(Method.GET);
+      request.setEndpoint("tracking_settings/open");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -178,13 +176,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "tracking_settings/subscription";
-      request.body = "{\"url\":\"url\",\"html_content\":\"html content\",\"enabled\":true,\"landing\":\"landing page html\",\"replace\":\"replacement tag\",\"plain_content\":\"text content\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("tracking_settings/subscription");
+      request.setBody("{\"url\":\"url\",\"html_content\":\"html content\",\"enabled\":true,\"landing\":\"landing page html\",\"replace\":\"replacement tag\",\"plain_content\":\"text content\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -201,12 +199,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "tracking_settings/subscription";
+      request.setMethod(Method.GET);
+      request.setEndpoint("tracking_settings/subscription");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/user/user.java b/examples/user/user.java
index 03c23df1..9c5ff95c 100644
--- a/examples/user/user.java
+++ b/examples/user/user.java
@@ -17,12 +17,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "user/account";
+      request.setMethod(Method.GET);
+      request.setEndpoint("user/account");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -39,12 +39,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "user/credits";
+      request.setMethod(Method.GET);
+      request.setEndpoint("user/credits");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -61,13 +61,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PUT;
-      request.endpoint = "user/email";
-      request.body = "{\"email\":\"example@example.com\"}";
+      request.setMethod(Method.PUT);
+      request.setEndpoint("user/email");
+      request.setBody("{\"email\":\"example@example.com\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -84,12 +84,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "user/email";
+      request.setMethod(Method.GET);
+      request.setEndpoint("user/email");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -106,13 +106,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PUT;
-      request.endpoint = "user/password";
-      request.body = "{\"new_password\":\"new_password\",\"old_password\":\"old_password\"}";
+      request.setMethod(Method.PUT);
+      request.setEndpoint("user/password");
+      request.setBody("{\"new_password\":\"new_password\",\"old_password\":\"old_password\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -129,13 +129,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "user/profile";
-      request.body = "{\"city\":\"Orange\",\"first_name\":\"Example\",\"last_name\":\"User\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("user/profile");
+      request.setBody("{\"city\":\"Orange\",\"first_name\":\"Example\",\"last_name\":\"User\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -152,12 +152,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "user/profile";
+      request.setMethod(Method.GET);
+      request.setEndpoint("user/profile");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -174,13 +174,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "user/scheduled_sends";
-      request.body = "{\"batch_id\":\"YOUR_BATCH_ID\",\"status\":\"pause\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("user/scheduled_sends");
+      request.setBody("{\"batch_id\":\"YOUR_BATCH_ID\",\"status\":\"pause\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -197,12 +197,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "user/scheduled_sends";
+      request.setMethod(Method.GET);
+      request.setEndpoint("user/scheduled_sends");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -219,13 +219,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "user/scheduled_sends/{batch_id}";
-      request.body = "{\"status\":\"pause\"}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("user/scheduled_sends/{batch_id}");
+      request.setBody("{\"status\":\"pause\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -242,12 +242,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "user/scheduled_sends/{batch_id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("user/scheduled_sends/{batch_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -264,12 +264,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "user/scheduled_sends/{batch_id}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("user/scheduled_sends/{batch_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -286,13 +286,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "user/settings/enforced_tls";
-      request.body = "{\"require_tls\":true,\"require_valid_cert\":false}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("user/settings/enforced_tls");
+      request.setBody("{\"require_tls\":true,\"require_valid_cert\":false}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -309,12 +309,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "user/settings/enforced_tls";
+      request.setMethod(Method.GET);
+      request.setEndpoint("user/settings/enforced_tls");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -331,13 +331,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PUT;
-      request.endpoint = "user/username";
-      request.body = "{\"username\":\"test_username\"}";
+      request.setMethod(Method.PUT);
+      request.setBody("user/username");
+      request.setBody("{\"username\":\"test_username\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -354,12 +354,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "user/username";
+      request.setMethod(Method.GET);
+      request.setEndpoint("user/username");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -376,13 +376,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "user/webhooks/event/settings";
-      request.body = "{\"group_resubscribe\":true,\"delivered\":true,\"group_unsubscribe\":true,\"spam_report\":true,\"url\":\"url\",\"enabled\":true,\"bounce\":true,\"deferred\":true,\"unsubscribe\":true,\"dropped\":true,\"open\":true,\"click\":true,\"processed\":true}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("user/webhooks/event/settings");
+      request.setBody("{\"group_resubscribe\":true,\"delivered\":true,\"group_unsubscribe\":true,\"spam_report\":true,\"url\":\"url\",\"enabled\":true,\"bounce\":true,\"deferred\":true,\"unsubscribe\":true,\"dropped\":true,\"open\":true,\"click\":true,\"processed\":true}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -399,12 +399,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "user/webhooks/event/settings";
+      request.setMethod(Method.GET);
+      request.setEndpoint("user/webhooks/event/settings");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -421,13 +421,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "user/webhooks/event/test";
-      request.body = "{\"url\":\"url\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("user/webhooks/event/test");
+      request.setBody("{\"url\":\"url\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -444,13 +444,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "user/webhooks/parse/settings";
-      request.body = "{\"url\":\"http://email.myhosthame.com\",\"send_raw\":false,\"hostname\":\"myhostname.com\",\"spam_check\":true}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("user/webhooks/parse/settings");
+      request.setBody("{\"url\":\"http://email.myhosthame.com\",\"send_raw\":false,\"hostname\":\"myhostname.com\",\"spam_check\":true}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -467,12 +467,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "user/webhooks/parse/settings";
+      request.setMethod(Method.GET);
+      request.setEndpoint("user/webhooks/parse/settings");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -489,13 +489,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "user/webhooks/parse/settings/{hostname}";
-      request.body = "{\"url\":\"http://newdomain.com/parse\",\"send_raw\":true,\"spam_check\":false}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("user/webhooks/parse/settings/{hostname}");
+      request.setBody("{\"url\":\"http://newdomain.com/parse\",\"send_raw\":true,\"spam_check\":false}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -512,12 +512,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "user/webhooks/parse/settings/{hostname}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("user/webhooks/parse/settings/{hostname}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -534,12 +534,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "user/webhooks/parse/settings/{hostname}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("user/webhooks/parse/settings/{hostname}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -556,19 +556,17 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "user/webhooks/parse/stats";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "test_string");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("offset", "test_string");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("user/webhooks/parse/stats");
+      request.addQueryParam("aggregated_by", "day");
+      request.addQueryParam("limit", "test_string");
+      request.addQueryParam("start_date", "2016-01-01");
+      request.addQueryParam("end_date", "2016-04-01");
+      request.addQueryParam("offset", "test_string");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/examples/whitelabel/whitelabel.java b/examples/whitelabel/whitelabel.java
index baabe3b7..4c668de5 100644
--- a/examples/whitelabel/whitelabel.java
+++ b/examples/whitelabel/whitelabel.java
@@ -17,13 +17,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "whitelabel/domains";
-      request.body = "{\"automatic_security\":false,\"username\":\"john@example.com\",\"domain\":\"example.com\",\"default\":true,\"custom_spf\":true,\"ips\":[\"192.168.1.1\",\"192.168.1.2\"],\"subdomain\":\"news\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("whitelabel/domains");
+      request.setBody("{\"automatic_security\":false,\"username\":\"john@example.com\",\"domain\":\"example.com\",\"default\":true,\"custom_spf\":true,\"ips\":[\"192.168.1.1\",\"192.168.1.2\"],\"subdomain\":\"news\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -40,19 +40,17 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "whitelabel/domains";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("username", "test_string");
-      queryParams.put("domain", "test_string");
-      queryParams.put("exclude_subusers", "true");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("whitelabel/domains");
+      request.addQueryParam("username", "test_string");
+      request.addQueryParam("domain", "test_string");
+      request.addQueryParam("exclude_subusers", "true");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -69,12 +67,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "whitelabel/domains/default";
+      request.setMethod(Method.GET);
+      request.setEndpoint("whitelabel/domains/default");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -91,12 +89,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "whitelabel/domains/subuser";
+      request.setMethod(Method.GET);
+      request.setEndpoint("whitelabel/domains/subuser");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -113,12 +111,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "whitelabel/domains/subuser";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("whitelabel/domains/subuser");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -135,13 +133,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "whitelabel/domains/{domain_id}";
-      request.body = "{\"default\":false,\"custom_spf\":true}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("whitelabel/domains/{domain_id}");
+      request.setBody("{\"default\":false,\"custom_spf\":true}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -158,12 +156,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "whitelabel/domains/{domain_id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("whitelabel/domains/{domain_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -180,12 +178,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "whitelabel/domains/{domain_id}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("whitelabel/domains/{domain_id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -202,13 +200,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "whitelabel/domains/{domain_id}/subuser";
-      request.body = "{\"username\":\"jane@example.com\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("whitelabel/domains/{domain_id}/subuser");
+      request.setBody("{\"username\":\"jane@example.com\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -225,13 +223,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "whitelabel/domains/{id}/ips";
-      request.body = "{\"ip\":\"192.168.0.1\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("whitelabel/domains/{id}/ips");
+      request.setBody("{\"ip\":\"192.168.0.1\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -248,12 +246,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "whitelabel/domains/{id}/ips/{ip}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("whitelabel/domains/{id}/ips/{ip}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -270,12 +268,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "whitelabel/domains/{id}/validate";
+      request.setMethod(Method.POST);
+      request.setEndpoint("whitelabel/domains/{id}/validate");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -292,13 +290,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "whitelabel/ips";
-      request.body = "{\"ip\":\"192.168.1.1\",\"domain\":\"example.com\",\"subdomain\":\"email\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("whitelabel/ips");
+      request.setBody("{\"ip\":\"192.168.1.1\",\"domain\":\"example.com\",\"subdomain\":\"email\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -315,17 +313,15 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "whitelabel/ips";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("ip", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("whitelabel/ips");
+      request.addQueryParam("ip", "test_string");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -342,12 +338,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "whitelabel/ips/{id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("whitelabel/ips/{id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -364,12 +360,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "whitelabel/ips/{id}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("whitelabel/ips/{id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -386,12 +382,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "whitelabel/ips/{id}/validate";
+      request.setMethod(Method.POST);
+      request.setEndpoint("whitelabel/ips/{id}/validate");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -408,17 +404,15 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "whitelabel/links";
-      request.body = "{\"default\":true,\"domain\":\"example.com\",\"subdomain\":\"mail\"}";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.POST);
+      request.setEndpoint("whitelabel/links");
+      request.setBody("{\"default\":true,\"domain\":\"example.com\",\"subdomain\":\"mail\"}");
+      request.addQueryParam("limit", "1");
+      request.addQueryParam("offset", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -435,15 +429,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "whitelabel/links";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("limit", "1");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("whitelabel/links");
+      request.addQueryParam("limit", "1");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -460,15 +452,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "whitelabel/links/default";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("domain", "test_string");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("whitelabel/links/default");
+      request.addQueryParam("domain", "test_string");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -485,15 +475,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "whitelabel/links/subuser";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("username", "test_string");
-      request.queryParams = queryParams;
+      request.setMethod(Method.GET);
+      request.setEndpoint("whitelabel/links/subuser");
+      request.addQueryParam("username", "test_string");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -510,15 +498,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "whitelabel/links/subuser";
-      Map<String,String> queryParams = new HashMap<String, String>();
-      queryParams.put("username", "test_string");
-      request.queryParams = queryParams;
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("whitelabel/links/subuser");
+      request.addQueryParam("username", "test_string");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -535,13 +521,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.PATCH;
-      request.endpoint = "whitelabel/links/{id}";
-      request.body = "{\"default\":true}";
+      request.setMethod(Method.PATCH);
+      request.setEndpoint("whitelabel/links/{id}");
+      request.setBody("{\"default\":true}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -558,12 +544,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.GET;
-      request.endpoint = "whitelabel/links/{id}";
+      request.setMethod(Method.GET);
+      request.setEndpoint("whitelabel/links/{id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -580,12 +566,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.DELETE;
-      request.endpoint = "whitelabel/links/{id}";
+      request.setMethod(Method.DELETE);
+      request.setEndpoint("whitelabel/links/{id}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -602,12 +588,12 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "whitelabel/links/{id}/validate";
+      request.setMethod(Method.POST);
+      request.setEndpoint("whitelabel/links/{id}/validate");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -624,13 +610,13 @@ public static void main(String[] args) throws IOException {
     try {
       SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
       Request request = new Request();
-      request.method = Method.POST;
-      request.endpoint = "whitelabel/links/{link_id}/subuser";
-      request.body = "{\"username\":\"jane@example.com\"}";
+      request.setMethod(Method.POST);
+      request.setEndpoint("whitelabel/links/{link_id}/subuser");
+      request.setBody("{\"username\":\"jane@example.com\"}");
       Response response = sg.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/src/main/java/com/sendgrid/SendGrid.java b/src/main/java/com/sendgrid/SendGrid.java
index 51f440ea..421b11a9 100644
--- a/src/main/java/com/sendgrid/SendGrid.java
+++ b/src/main/java/com/sendgrid/SendGrid.java
@@ -99,12 +99,16 @@ public Response makeCall(Request request) throws IOException {
     */
   public Response api(Request request) throws IOException {
     Request req = new Request();
-    req.method = request.method;
-    req.baseUri = this.host;
-    req.endpoint = "/" + version + "/" + request.endpoint;
-    req.body = request.body;
-    req.headers = this.requestHeaders;
-    req.queryParams = request.queryParams;
+    req.setMethod(request.getMethod());
+    req.setBaseUri(this.host);
+    req.setEndpoint("/" + version + "/" + request.getEndpoint());
+    req.setBody(request.getBody());
+    for (Map.Entry <String, String> header : this.requestHeaders.entrySet()) {
+      req.addHeader(header.getKey(), header.getValue());
+    }
+    for (Map.Entry <String, String> queryParam : request.getQueryParams().entrySet()) {
+      req.addQueryParam(queryParam.getKey(), queryParam.getValue());
+    }
 
     return makeCall(req);
   }
diff --git a/src/test/java/com/sendgrid/MockSendGrid.java b/src/test/java/com/sendgrid/MockSendGrid.java
index 006b27c7..35f65ae1 100644
--- a/src/test/java/com/sendgrid/MockSendGrid.java
+++ b/src/test/java/com/sendgrid/MockSendGrid.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Map;
 
 public class MockSendGrid extends SendGrid {
   Request request;
@@ -13,10 +14,11 @@ public MockSendGrid(String apiKey) {
   public Response makeCall(Request request) throws IOException {
     this.request = request;
     Response response = new Response();
-    response.statusCode = 200;
-    response.body = "{\"message\":\"success\"}";
-    response.headers = new HashMap<String, String>();
-    response.headers.put("Test", "Header");
+    response.setStatusCode(200);
+    response.setBody("{\"message\":\"success\"}");
+    Map<String, String> headers = new HashMap<>();
+    headers.put("Test", "Header");
+    response.setHeaders(headers);
     return response;
   }
 
diff --git a/src/test/java/com/sendgrid/SendGridTest.java b/src/test/java/com/sendgrid/SendGridTest.java
index dca0222d..5ec45eab 100644
--- a/src/test/java/com/sendgrid/SendGridTest.java
+++ b/src/test/java/com/sendgrid/SendGridTest.java
@@ -88,13 +88,11 @@ public void test_access_settings_activity_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "access_settings/activity";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("access_settings/activity");
+    request.addQueryParam("limit", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -110,11 +108,11 @@ public void test_access_settings_whitelist_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "access_settings/whitelist";
-    request.body = "{\"ips\":[{\"ip\":\"192.168.1.1\"},{\"ip\":\"192.*.*.*\"},{\"ip\":\"192.168.1.3/32\"}]}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("access_settings/whitelist");
+    request.setBody("{\"ips\":[{\"ip\":\"192.168.1.1\"},{\"ip\":\"192.*.*.*\"},{\"ip\":\"192.168.1.3/32\"}]}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -130,10 +128,10 @@ public void test_access_settings_whitelist_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "access_settings/whitelist";
+    request.setMethod(Method.GET);
+    request.setEndpoint("access_settings/whitelist");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -149,11 +147,11 @@ public void test_access_settings_whitelist_delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "access_settings/whitelist";
-    request.body = "{\"ids\":[1,2,3]}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("access_settings/whitelist");
+    request.setBody("{\"ids\":[1,2,3]}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -169,10 +167,10 @@ public void test_access_settings_whitelist__rule_id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "access_settings/whitelist/{rule_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("access_settings/whitelist/{rule_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -188,10 +186,10 @@ public void test_access_settings_whitelist__rule_id__delete() throws IOException
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "access_settings/whitelist/{rule_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("access_settings/whitelist/{rule_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -207,11 +205,11 @@ public void test_alerts_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "alerts";
-    request.body = "{\"type\":\"stats_notification\",\"frequency\":\"daily\",\"email_to\":\"example@example.com\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("alerts");
+    request.setBody("{\"type\":\"stats_notification\",\"frequency\":\"daily\",\"email_to\":\"example@example.com\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -227,10 +225,10 @@ public void test_alerts_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "alerts";
+    request.setMethod(Method.GET);
+    request.setEndpoint("alerts");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -246,11 +244,11 @@ public void test_alerts__alert_id__patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "alerts/{alert_id}";
-    request.body = "{\"email_to\":\"example@example.com\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("alerts/{alert_id}");
+    request.setBody("{\"email_to\":\"example@example.com\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -266,10 +264,10 @@ public void test_alerts__alert_id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "alerts/{alert_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("alerts/{alert_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -285,10 +283,10 @@ public void test_alerts__alert_id__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "alerts/{alert_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("alerts/{alert_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -304,11 +302,11 @@ public void test_api_keys_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "api_keys";
-    request.body = "{\"sample\":\"data\",\"scopes\":[\"mail.send\",\"alerts.create\",\"alerts.read\"],\"name\":\"My API Key\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("api_keys");
+    request.setBody("{\"sample\":\"data\",\"scopes\":[\"mail.send\",\"alerts.create\",\"alerts.read\"],\"name\":\"My API Key\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -324,13 +322,11 @@ public void test_api_keys_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "api_keys";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("api_keys");
+    request.addQueryParam("limit", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -346,11 +342,11 @@ public void test_api_keys__api_key_id__put() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PUT;
-    request.endpoint = "api_keys/{api_key_id}";
-    request.body = "{\"scopes\":[\"user.profile.read\",\"user.profile.update\"],\"name\":\"A New Hope\"}";
+    request.setMethod(Method.PUT);
+    request.setEndpoint("api_keys/{api_key_id}");
+    request.setBody("{\"scopes\":[\"user.profile.read\",\"user.profile.update\"],\"name\":\"A New Hope\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -366,11 +362,11 @@ public void test_api_keys__api_key_id__patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "api_keys/{api_key_id}";
-    request.body = "{\"name\":\"A New Hope\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("api_keys/{api_key_id}");
+    request.setBody("{\"name\":\"A New Hope\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -386,10 +382,10 @@ public void test_api_keys__api_key_id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "api_keys/{api_key_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("api_keys/{api_key_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -405,10 +401,10 @@ public void test_api_keys__api_key_id__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "api_keys/{api_key_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("api_keys/{api_key_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -424,11 +420,11 @@ public void test_asm_groups_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "asm/groups";
-    request.body = "{\"is_default\":true,\"description\":\"Suggestions for products our users might like.\",\"name\":\"Product Suggestions\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("asm/groups");
+    request.setBody("{\"is_default\":true,\"description\":\"Suggestions for products our users might like.\",\"name\":\"Product Suggestions\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -444,13 +440,11 @@ public void test_asm_groups_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "asm/groups";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("id", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("asm/groups");
+    request.addQueryParam("id", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -466,11 +460,11 @@ public void test_asm_groups__group_id__patch() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "asm/groups/{group_id}";
-    request.body = "{\"description\":\"Suggestions for items our users might like.\",\"name\":\"Item Suggestions\",\"id\":103}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("asm/groups/{group_id}");
+    request.setBody("{\"description\":\"Suggestions for items our users might like.\",\"name\":\"Item Suggestions\",\"id\":103}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -486,10 +480,10 @@ public void test_asm_groups__group_id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "asm/groups/{group_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("asm/groups/{group_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -505,10 +499,10 @@ public void test_asm_groups__group_id__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "asm/groups/{group_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("asm/groups/{group_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -524,11 +518,11 @@ public void test_asm_groups__group_id__suppressions_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "asm/groups/{group_id}/suppressions";
-    request.body = "{\"recipient_emails\":[\"test1@example.com\",\"test2@example.com\"]}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("asm/groups/{group_id}/suppressions");
+    request.setBody("{\"recipient_emails\":[\"test1@example.com\",\"test2@example.com\"]}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -544,10 +538,10 @@ public void test_asm_groups__group_id__suppressions_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "asm/groups/{group_id}/suppressions";
+    request.setMethod(Method.GET);
+    request.setEndpoint("asm/groups/{group_id}/suppressions");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -563,11 +557,11 @@ public void test_asm_groups__group_id__suppressions_search_post() throws IOExcep
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "asm/groups/{group_id}/suppressions/search";
-    request.body = "{\"recipient_emails\":[\"exists1@example.com\",\"exists2@example.com\",\"doesnotexists@example.com\"]}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("asm/groups/{group_id}/suppressions/search");
+    request.setBody("{\"recipient_emails\":[\"exists1@example.com\",\"exists2@example.com\",\"doesnotexists@example.com\"]}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -583,10 +577,10 @@ public void test_asm_groups__group_id__suppressions__email__delete() throws IOEx
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "asm/groups/{group_id}/suppressions/{email}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("asm/groups/{group_id}/suppressions/{email}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -602,10 +596,10 @@ public void test_asm_suppressions_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "asm/suppressions";
+    request.setMethod(Method.GET);
+    request.setEndpoint("asm/suppressions");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -621,11 +615,11 @@ public void test_asm_suppressions_global_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "asm/suppressions/global";
-    request.body = "{\"recipient_emails\":[\"test1@example.com\",\"test2@example.com\"]}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("asm/suppressions/global");
+    request.setBody("{\"recipient_emails\":[\"test1@example.com\",\"test2@example.com\"]}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -641,10 +635,10 @@ public void test_asm_suppressions_global__email__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "asm/suppressions/global/{email}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("asm/suppressions/global/{email}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -660,10 +654,10 @@ public void test_asm_suppressions_global__email__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "asm/suppressions/global/{email}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("asm/suppressions/global/{email}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -679,10 +673,10 @@ public void test_asm_suppressions__email__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "asm/suppressions/{email}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("asm/suppressions/{email}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -698,18 +692,16 @@ public void test_browsers_stats_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "browsers/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("browsers", "test_string");
-      queryParams.put("limit", "test_string");
-      queryParams.put("offset", "test_string");
-      queryParams.put("start_date", "2016-01-01");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("browsers/stats");
+    request.addQueryParam("end_date", "2016-04-01");
+    request.addQueryParam("aggregated_by", "day");
+    request.addQueryParam("browsers", "test_string");
+    request.addQueryParam("limit", "test_string");
+    request.addQueryParam("offset", "test_string");
+    request.addQueryParam("start_date", "2016-01-01");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -725,11 +717,11 @@ public void test_campaigns_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "campaigns";
-    request.body = "{\"custom_unsubscribe_url\":\"\",\"html_content\":\"<html><head><title></title></head><body><p>Check out our spring line!</p></body></html>\",\"list_ids\":[110,124],\"sender_id\":124451,\"subject\":\"New Products for Spring!\",\"plain_content\":\"Check out our spring line!\",\"suppression_group_id\":42,\"title\":\"March Newsletter\",\"segment_ids\":[110],\"categories\":[\"spring line\"],\"ip_pool\":\"marketing\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("campaigns");
+    request.setBody("{\"custom_unsubscribe_url\":\"\",\"html_content\":\"<html><head><title></title></head><body><p>Check out our spring line!</p></body></html>\",\"list_ids\":[110,124],\"sender_id\":124451,\"subject\":\"New Products for Spring!\",\"plain_content\":\"Check out our spring line!\",\"suppression_group_id\":42,\"title\":\"March Newsletter\",\"segment_ids\":[110],\"categories\":[\"spring line\"],\"ip_pool\":\"marketing\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -745,14 +737,12 @@ public void test_campaigns_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "campaigns";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("campaigns");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -768,11 +758,11 @@ public void test_campaigns__campaign_id__patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "campaigns/{campaign_id}";
-    request.body = "{\"html_content\":\"<html><head><title></title></head><body><p>Check out our summer line!</p></body></html>\",\"subject\":\"New Products for Summer!\",\"title\":\"May Newsletter\",\"categories\":[\"summer line\"],\"plain_content\":\"Check out our summer line!\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("campaigns/{campaign_id}");
+    request.setBody("{\"html_content\":\"<html><head><title></title></head><body><p>Check out our summer line!</p></body></html>\",\"subject\":\"New Products for Summer!\",\"title\":\"May Newsletter\",\"categories\":[\"summer line\"],\"plain_content\":\"Check out our summer line!\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -788,10 +778,10 @@ public void test_campaigns__campaign_id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "campaigns/{campaign_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("campaigns/{campaign_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -807,10 +797,10 @@ public void test_campaigns__campaign_id__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "campaigns/{campaign_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("campaigns/{campaign_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -826,11 +816,11 @@ public void test_campaigns__campaign_id__schedules_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "campaigns/{campaign_id}/schedules";
-    request.body = "{\"send_at\":1489451436}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("campaigns/{campaign_id}/schedules");
+    request.setBody("{\"send_at\":1489451436}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -846,11 +836,11 @@ public void test_campaigns__campaign_id__schedules_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "campaigns/{campaign_id}/schedules";
-    request.body = "{\"send_at\":1489771528}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("campaigns/{campaign_id}/schedules");
+    request.setBody("{\"send_at\":1489771528}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -866,10 +856,10 @@ public void test_campaigns__campaign_id__schedules_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "campaigns/{campaign_id}/schedules";
+    request.setMethod(Method.GET);
+    request.setEndpoint("campaigns/{campaign_id}/schedules");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -885,10 +875,10 @@ public void test_campaigns__campaign_id__schedules_delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "campaigns/{campaign_id}/schedules";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("campaigns/{campaign_id}/schedules");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -904,10 +894,10 @@ public void test_campaigns__campaign_id__schedules_now_post() throws IOException
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "campaigns/{campaign_id}/schedules/now";
+    request.setMethod(Method.POST);
+    request.setEndpoint("campaigns/{campaign_id}/schedules/now");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -923,11 +913,11 @@ public void test_campaigns__campaign_id__schedules_test_post() throws IOExceptio
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "campaigns/{campaign_id}/schedules/test";
-    request.body = "{\"to\":\"your.email@example.com\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("campaigns/{campaign_id}/schedules/test");
+    request.setBody("{\"to\":\"your.email@example.com\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -943,15 +933,13 @@ public void test_categories_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "categories";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("category", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("categories");
+    request.addQueryParam("category", "test_string");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -967,18 +955,16 @@ public void test_categories_stats_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "categories/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("categories", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("categories/stats");
+    request.addQueryParam("end_date", "2016-04-01");
+    request.addQueryParam("aggregated_by", "day");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("offset", "1");
+    request.addQueryParam("start_date", "2016-01-01");
+    request.addQueryParam("categories", "test_string");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -994,19 +980,17 @@ public void test_categories_stats_sums_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "categories/stats/sums";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("sort_by_metric", "test_string");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("sort_by_direction", "asc");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("categories/stats/sums");
+    request.addQueryParam("end_date", "2016-04-01");
+    request.addQueryParam("aggregated_by", "day");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("sort_by_metric", "test_string");
+    request.addQueryParam("offset", "1");
+    request.addQueryParam("start_date", "2016-01-01");
+    request.addQueryParam("sort_by_direction", "asc");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1022,15 +1006,13 @@ public void test_clients_stats_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "clients/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("aggregated_by", "day");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("clients/stats");
+    request.addQueryParam("aggregated_by", "day");
+    request.addQueryParam("start_date", "2016-01-01");
+    request.addQueryParam("end_date", "2016-04-01");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1046,15 +1028,13 @@ public void test_clients__client_type__stats_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "clients/{client_type}/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("aggregated_by", "day");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("clients/{client_type}/stats");
+    request.addQueryParam("aggregated_by", "day");
+    request.addQueryParam("start_date", "2016-01-01");
+    request.addQueryParam("end_date", "2016-04-01");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1070,11 +1050,11 @@ public void test_contactdb_custom_fields_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "contactdb/custom_fields";
-    request.body = "{\"type\":\"text\",\"name\":\"pet\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("contactdb/custom_fields");
+    request.setBody("{\"type\":\"text\",\"name\":\"pet\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -1090,10 +1070,10 @@ public void test_contactdb_custom_fields_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/custom_fields";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/custom_fields");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1109,10 +1089,10 @@ public void test_contactdb_custom_fields__custom_field_id__get() throws IOExcept
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/custom_fields/{custom_field_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/custom_fields/{custom_field_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1128,10 +1108,10 @@ public void test_contactdb_custom_fields__custom_field_id__delete() throws IOExc
     sg.addRequestHeader("X-Mock", "202");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "contactdb/custom_fields/{custom_field_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("contactdb/custom_fields/{custom_field_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(202, response.statusCode);
+    Assert.assertEquals(202, response.getStatusCode());
   }
 
   @Test
@@ -1147,11 +1127,11 @@ public void test_contactdb_lists_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "contactdb/lists";
-    request.body = "{\"name\":\"your list name\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("contactdb/lists");
+    request.setBody("{\"name\":\"your list name\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -1167,10 +1147,10 @@ public void test_contactdb_lists_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/lists";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/lists");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1186,11 +1166,11 @@ public void test_contactdb_lists_delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "contactdb/lists";
-    request.body = "[1,2,3,4]";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("contactdb/lists");
+    request.setBody("[1,2,3,4]");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -1206,14 +1186,12 @@ public void test_contactdb_lists__list_id__patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "contactdb/lists/{list_id}";
-    request.body = "{\"name\":\"newlistname\"}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("list_id", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("contactdb/lists/{list_id}");
+    request.setBody("{\"name\":\"newlistname\"}");
+    request.addQueryParam("list_id", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1229,13 +1207,11 @@ public void test_contactdb_lists__list_id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/lists/{list_id}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("list_id", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/lists/{list_id}");
+    request.addQueryParam("list_id", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1251,13 +1227,11 @@ public void test_contactdb_lists__list_id__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "202");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "contactdb/lists/{list_id}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("delete_contacts", "true");
-    request.queryParams = queryParams;
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("contactdb/lists/{list_id}");
+    request.addQueryParam("delete_contacts", "true");
     Response response = sg.api(request);
-    Assert.assertEquals(202, response.statusCode);
+    Assert.assertEquals(202, response.getStatusCode());
   }
 
   @Test
@@ -1273,11 +1247,11 @@ public void test_contactdb_lists__list_id__recipients_post() throws IOException
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "contactdb/lists/{list_id}/recipients";
-    request.body = "[\"recipient_id1\",\"recipient_id2\"]";
+    request.setMethod(Method.POST);
+    request.setEndpoint("contactdb/lists/{list_id}/recipients");
+    request.setBody("[\"recipient_id1\",\"recipient_id2\"]");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -1293,15 +1267,13 @@ public void test_contactdb_lists__list_id__recipients_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/lists/{list_id}/recipients";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("page", "1");
-      queryParams.put("page_size", "1");
-      queryParams.put("list_id", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/lists/{list_id}/recipients");
+    request.addQueryParam("page", "1");
+    request.addQueryParam("page_size", "1");
+    request.addQueryParam("list_id", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1317,10 +1289,10 @@ public void test_contactdb_lists__list_id__recipients__recipient_id__post() thro
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "contactdb/lists/{list_id}/recipients/{recipient_id}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("contactdb/lists/{list_id}/recipients/{recipient_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -1336,14 +1308,12 @@ public void test_contactdb_lists__list_id__recipients__recipient_id__delete() th
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "contactdb/lists/{list_id}/recipients/{recipient_id}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("recipient_id", "1");
-      queryParams.put("list_id", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("contactdb/lists/{list_id}/recipients/{recipient_id}");
+    request.addQueryParam("recipient_id", "1");
+    request.addQueryParam("list_id", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -1359,11 +1329,11 @@ public void test_contactdb_recipients_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "contactdb/recipients";
-    request.body = "[{\"first_name\":\"Guy\",\"last_name\":\"Jones\",\"email\":\"jones@example.com\"}]";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("contactdb/recipients");
+    request.setBody("[{\"first_name\":\"Guy\",\"last_name\":\"Jones\",\"email\":\"jones@example.com\"}]");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -1379,11 +1349,11 @@ public void test_contactdb_recipients_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "contactdb/recipients";
-    request.body = "[{\"age\":25,\"last_name\":\"User\",\"email\":\"example@example.com\",\"first_name\":\"\"},{\"age\":25,\"last_name\":\"User\",\"email\":\"example2@example.com\",\"first_name\":\"Example\"}]";
+    request.setMethod(Method.POST);
+    request.setEndpoint("contactdb/recipients");
+    request.setBody("[{\"age\":25,\"last_name\":\"User\",\"email\":\"example@example.com\",\"first_name\":\"\"},{\"age\":25,\"last_name\":\"User\",\"email\":\"example2@example.com\",\"first_name\":\"Example\"}]");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -1399,14 +1369,12 @@ public void test_contactdb_recipients_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/recipients";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("page", "1");
-      queryParams.put("page_size", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/recipients");
+    request.addQueryParam("page", "1");
+    request.addQueryParam("page_size", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1422,11 +1390,11 @@ public void test_contactdb_recipients_delete() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "contactdb/recipients";
-    request.body = "[\"recipient_id1\",\"recipient_id2\"]";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("contactdb/recipients");
+    request.setBody("[\"recipient_id1\",\"recipient_id2\"]");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1442,10 +1410,10 @@ public void test_contactdb_recipients_billable_count_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/recipients/billable_count";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/recipients/billable_count");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1461,10 +1429,10 @@ public void test_contactdb_recipients_count_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/recipients/count";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/recipients/count");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1480,13 +1448,11 @@ public void test_contactdb_recipients_search_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/recipients/search";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("{field_name}", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/recipients/search");
+    request.addQueryParam("{field_name}", "test_string");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1502,10 +1468,10 @@ public void test_contactdb_recipients__recipient_id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/recipients/{recipient_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/recipients/{recipient_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1521,10 +1487,10 @@ public void test_contactdb_recipients__recipient_id__delete() throws IOException
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "contactdb/recipients/{recipient_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("contactdb/recipients/{recipient_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -1540,10 +1506,10 @@ public void test_contactdb_recipients__recipient_id__lists_get() throws IOExcept
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/recipients/{recipient_id}/lists";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/recipients/{recipient_id}/lists");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1559,10 +1525,10 @@ public void test_contactdb_reserved_fields_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/reserved_fields";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/reserved_fields");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1578,11 +1544,11 @@ public void test_contactdb_segments_post() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "contactdb/segments";
-    request.body = "{\"conditions\":[{\"operator\":\"eq\",\"field\":\"last_name\",\"and_or\":\"\",\"value\":\"Miller\"},{\"operator\":\"gt\",\"field\":\"last_clicked\",\"and_or\":\"and\",\"value\":\"01/02/2015\"},{\"operator\":\"eq\",\"field\":\"clicks.campaign_identifier\",\"and_or\":\"or\",\"value\":\"513\"}],\"name\":\"Last Name Miller\",\"list_id\":4}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("contactdb/segments");
+    request.setBody("{\"conditions\":[{\"operator\":\"eq\",\"field\":\"last_name\",\"and_or\":\"\",\"value\":\"Miller\"},{\"operator\":\"gt\",\"field\":\"last_clicked\",\"and_or\":\"and\",\"value\":\"01/02/2015\"},{\"operator\":\"eq\",\"field\":\"clicks.campaign_identifier\",\"and_or\":\"or\",\"value\":\"513\"}],\"name\":\"Last Name Miller\",\"list_id\":4}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1598,10 +1564,10 @@ public void test_contactdb_segments_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/segments";
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/segments");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1617,14 +1583,12 @@ public void test_contactdb_segments__segment_id__patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "contactdb/segments/{segment_id}";
-    request.body = "{\"conditions\":[{\"operator\":\"eq\",\"field\":\"last_name\",\"and_or\":\"\",\"value\":\"Miller\"}],\"name\":\"The Millers\",\"list_id\":5}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("segment_id", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("contactdb/segments/{segment_id}");
+    request.setBody("{\"conditions\":[{\"operator\":\"eq\",\"field\":\"last_name\",\"and_or\":\"\",\"value\":\"Miller\"}],\"name\":\"The Millers\",\"list_id\":5}");
+    request.addQueryParam("segment_id", "test_string");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1640,13 +1604,11 @@ public void test_contactdb_segments__segment_id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/segments/{segment_id}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("segment_id", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/segments/{segment_id}");
+    request.addQueryParam("segment_id", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1662,13 +1624,11 @@ public void test_contactdb_segments__segment_id__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "contactdb/segments/{segment_id}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("delete_contacts", "true");
-    request.queryParams = queryParams;
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("contactdb/segments/{segment_id}");
+    request.addQueryParam("delete_contacts", "true");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -1684,14 +1644,12 @@ public void test_contactdb_segments__segment_id__recipients_get() throws IOExcep
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "contactdb/segments/{segment_id}/recipients";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("page", "1");
-      queryParams.put("page_size", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("contactdb/segments/{segment_id}/recipients");
+    request.addQueryParam("page", "1");
+    request.addQueryParam("page_size", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1707,17 +1665,15 @@ public void test_devices_stats_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "devices/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("devices/stats");
+    request.addQueryParam("aggregated_by", "day");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("start_date", "2016-01-01");
+    request.addQueryParam("end_date", "2016-04-01");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1733,18 +1689,16 @@ public void test_geo_stats_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "geo/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("end_date", "2016-04-01");
-      queryParams.put("country", "US");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("geo/stats");
+    request.addQueryParam("end_date", "2016-04-01");
+    request.addQueryParam("country", "US");
+    request.addQueryParam("aggregated_by", "day");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("offset", "1");
+    request.addQueryParam("start_date", "2016-01-01");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1760,17 +1714,15 @@ public void test_ips_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "ips";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("subuser", "test_string");
-      queryParams.put("ip", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("exclude_whitelabels", "true");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("ips");
+    request.addQueryParam("subuser", "test_string");
+    request.addQueryParam("ip", "test_string");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("exclude_whitelabels", "true");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1786,10 +1738,10 @@ public void test_ips_assigned_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "ips/assigned";
+    request.setMethod(Method.GET);
+    request.setEndpoint("ips/assigned");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1805,11 +1757,11 @@ public void test_ips_pools_post() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "ips/pools";
-    request.body = "{\"name\":\"marketing\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("ips/pools");
+    request.setBody("{\"name\":\"marketing\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1825,10 +1777,10 @@ public void test_ips_pools_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "ips/pools";
+    request.setMethod(Method.GET);
+    request.setEndpoint("ips/pools");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1844,11 +1796,11 @@ public void test_ips_pools__pool_name__put() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PUT;
-    request.endpoint = "ips/pools/{pool_name}";
-    request.body = "{\"name\":\"new_pool_name\"}";
+    request.setMethod(Method.PUT);
+    request.setEndpoint("ips/pools/{pool_name}");
+    request.setBody("{\"name\":\"new_pool_name\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1864,10 +1816,10 @@ public void test_ips_pools__pool_name__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "ips/pools/{pool_name}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("ips/pools/{pool_name}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1883,10 +1835,10 @@ public void test_ips_pools__pool_name__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "ips/pools/{pool_name}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("ips/pools/{pool_name}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -1902,11 +1854,11 @@ public void test_ips_pools__pool_name__ips_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "ips/pools/{pool_name}/ips";
-    request.body = "{\"ip\":\"0.0.0.0\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("ips/pools/{pool_name}/ips");
+    request.setBody("{\"ip\":\"0.0.0.0\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -1922,10 +1874,10 @@ public void test_ips_pools__pool_name__ips__ip__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "ips/pools/{pool_name}/ips/{ip}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("ips/pools/{pool_name}/ips/{ip}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -1941,11 +1893,11 @@ public void test_ips_warmup_post() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "ips/warmup";
-    request.body = "{\"ip\":\"0.0.0.0\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("ips/warmup");
+    request.setBody("{\"ip\":\"0.0.0.0\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1961,10 +1913,10 @@ public void test_ips_warmup_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "ips/warmup";
+    request.setMethod(Method.GET);
+    request.setEndpoint("ips/warmup");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1980,10 +1932,10 @@ public void test_ips_warmup__ip_address__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "ips/warmup/{ip_address}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("ips/warmup/{ip_address}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -1999,10 +1951,10 @@ public void test_ips_warmup__ip_address__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "ips/warmup/{ip_address}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("ips/warmup/{ip_address}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -2018,10 +1970,10 @@ public void test_ips__ip_address__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "ips/{ip_address}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("ips/{ip_address}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2037,10 +1989,10 @@ public void test_mail_batch_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "mail/batch";
+    request.setMethod(Method.POST);
+    request.setEndpoint("mail/batch");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -2056,10 +2008,10 @@ public void test_mail_batch__batch_id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail/batch/{batch_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail/batch/{batch_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2075,11 +2027,11 @@ public void test_mail_send_post() throws IOException {
     sg.addRequestHeader("X-Mock", "202");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "mail/send";
-    request.body = "{\"custom_args\":{\"New Argument 1\":\"New Value 1\",\"activationAttempt\":\"1\",\"customerAccountNumber\":\"[CUSTOMER ACCOUNT NUMBER GOES HERE]\"},\"from\":{\"email\":\"sam.smith@example.com\",\"name\":\"Sam Smith\"},\"attachments\":[{\"name\":\"file1\",\"filename\":\"file1.jpg\",\"content\":\"[BASE64 encoded content block here]\",\"disposition\":\"inline\",\"content_id\":\"ii_139db99fdb5c3704\",\"type\":\"jpg\"}],\"personalizations\":[{\"to\":[{\"email\":\"john.doe@example.com\",\"name\":\"John Doe\"}],\"cc\":[{\"email\":\"jane.doe@example.com\",\"name\":\"Jane Doe\"}],\"bcc\":[{\"email\":\"sam.doe@example.com\",\"name\":\"Sam Doe\"}],\"custom_args\":{\"New Argument 1\":\"New Value 1\",\"activationAttempt\":\"1\",\"customerAccountNumber\":\"[CUSTOMER ACCOUNT NUMBER GOES HERE]\"},\"headers\":{\"X-Accept-Language\":\"en\",\"X-Mailer\":\"MyApp\"},\"send_at\":1409348513,\"substitutions\":{\"type\":\"object\",\"id\":\"substitutions\"},\"subject\":\"Hello, World!\"}],\"subject\":\"Hello, World!\",\"ip_pool_name\":\"[YOUR POOL NAME GOES HERE]\",\"content\":[{\"type\":\"text/html\",\"value\":\"<html><p>Hello, world!</p><img src=[CID GOES HERE]></img></html>\"}],\"headers\":{},\"asm\":{\"groups_to_display\":[1,2,3],\"group_id\":1},\"batch_id\":\"[YOUR BATCH ID GOES HERE]\",\"tracking_settings\":{\"subscription_tracking\":{\"text\":\"If you would like to unsubscribe and stop receiveing these emails <% click here %>.\",\"enable\":true,\"html\":\"If you would like to unsubscribe and stop receiving these emails <% clickhere %>.\",\"substitution_tag\":\"<%click here%>\"},\"open_tracking\":{\"enable\":true,\"substitution_tag\":\"%opentrack\"},\"click_tracking\":{\"enable\":true,\"enable_text\":true},\"ganalytics\":{\"utm_campaign\":\"[NAME OF YOUR REFERRER SOURCE]\",\"enable\":true,\"utm_name\":\"[NAME OF YOUR CAMPAIGN]\",\"utm_term\":\"[IDENTIFY PAID KEYWORDS HERE]\",\"utm_content\":\"[USE THIS SPACE TO DIFFERENTIATE YOUR EMAIL FROM ADS]\",\"utm_medium\":\"[NAME OF YOUR MARKETING MEDIUM e.g. email]\"}},\"mail_settings\":{\"footer\":{\"text\":\"Thanks,/n The SendGrid Team\",\"enable\":true,\"html\":\"<p>Thanks</br>The SendGrid Team</p>\"},\"spam_check\":{\"threshold\":3,\"post_to_url\":\"http://example.com/compliance\",\"enable\":true},\"bypass_list_management\":{\"enable\":true},\"sandbox_mode\":{\"enable\":false},\"bcc\":{\"enable\":true,\"email\":\"ben.doe@example.com\"}},\"reply_to\":{\"email\":\"sam.smith@example.com\",\"name\":\"Sam Smith\"},\"sections\":{\"section\":{\":sectionName2\":\"section 2 text\",\":sectionName1\":\"section 1 text\"}},\"template_id\":\"[YOUR TEMPLATE ID GOES HERE]\",\"categories\":[\"category1\",\"category2\"],\"send_at\":1409348513}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("mail/send");
+    request.setBody("{\"custom_args\":{\"New Argument 1\":\"New Value 1\",\"activationAttempt\":\"1\",\"customerAccountNumber\":\"[CUSTOMER ACCOUNT NUMBER GOES HERE]\"},\"from\":{\"email\":\"sam.smith@example.com\",\"name\":\"Sam Smith\"},\"attachments\":[{\"name\":\"file1\",\"filename\":\"file1.jpg\",\"content\":\"[BASE64 encoded content block here]\",\"disposition\":\"inline\",\"content_id\":\"ii_139db99fdb5c3704\",\"type\":\"jpg\"}],\"personalizations\":[{\"to\":[{\"email\":\"john.doe@example.com\",\"name\":\"John Doe\"}],\"cc\":[{\"email\":\"jane.doe@example.com\",\"name\":\"Jane Doe\"}],\"bcc\":[{\"email\":\"sam.doe@example.com\",\"name\":\"Sam Doe\"}],\"custom_args\":{\"New Argument 1\":\"New Value 1\",\"activationAttempt\":\"1\",\"customerAccountNumber\":\"[CUSTOMER ACCOUNT NUMBER GOES HERE]\"},\"headers\":{\"X-Accept-Language\":\"en\",\"X-Mailer\":\"MyApp\"},\"send_at\":1409348513,\"substitutions\":{\"type\":\"object\",\"id\":\"substitutions\"},\"subject\":\"Hello, World!\"}],\"subject\":\"Hello, World!\",\"ip_pool_name\":\"[YOUR POOL NAME GOES HERE]\",\"content\":[{\"type\":\"text/html\",\"value\":\"<html><p>Hello, world!</p><img src=[CID GOES HERE]></img></html>\"}],\"headers\":{},\"asm\":{\"groups_to_display\":[1,2,3],\"group_id\":1},\"batch_id\":\"[YOUR BATCH ID GOES HERE]\",\"tracking_settings\":{\"subscription_tracking\":{\"text\":\"If you would like to unsubscribe and stop receiveing these emails <% click here %>.\",\"enable\":true,\"html\":\"If you would like to unsubscribe and stop receiving these emails <% clickhere %>.\",\"substitution_tag\":\"<%click here%>\"},\"open_tracking\":{\"enable\":true,\"substitution_tag\":\"%opentrack\"},\"click_tracking\":{\"enable\":true,\"enable_text\":true},\"ganalytics\":{\"utm_campaign\":\"[NAME OF YOUR REFERRER SOURCE]\",\"enable\":true,\"utm_name\":\"[NAME OF YOUR CAMPAIGN]\",\"utm_term\":\"[IDENTIFY PAID KEYWORDS HERE]\",\"utm_content\":\"[USE THIS SPACE TO DIFFERENTIATE YOUR EMAIL FROM ADS]\",\"utm_medium\":\"[NAME OF YOUR MARKETING MEDIUM e.g. email]\"}},\"mail_settings\":{\"footer\":{\"text\":\"Thanks,/n The SendGrid Team\",\"enable\":true,\"html\":\"<p>Thanks</br>The SendGrid Team</p>\"},\"spam_check\":{\"threshold\":3,\"post_to_url\":\"http://example.com/compliance\",\"enable\":true},\"bypass_list_management\":{\"enable\":true},\"sandbox_mode\":{\"enable\":false},\"bcc\":{\"enable\":true,\"email\":\"ben.doe@example.com\"}},\"reply_to\":{\"email\":\"sam.smith@example.com\",\"name\":\"Sam Smith\"},\"sections\":{\"section\":{\":sectionName2\":\"section 2 text\",\":sectionName1\":\"section 1 text\"}},\"template_id\":\"[YOUR TEMPLATE ID GOES HERE]\",\"categories\":[\"category1\",\"category2\"],\"send_at\":1409348513}");
     Response response = sg.api(request);
-    Assert.assertEquals(202, response.statusCode);
+    Assert.assertEquals(202, response.getStatusCode());
   }
 
   @Test
@@ -2095,14 +2047,12 @@ public void test_mail_settings_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2118,11 +2068,11 @@ public void test_mail_settings_address_whitelist_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/address_whitelist";
-    request.body = "{\"list\":[\"email1@example.com\",\"example.com\"],\"enabled\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/address_whitelist");
+    request.setBody("{\"list\":[\"email1@example.com\",\"example.com\"],\"enabled\":true}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2138,10 +2088,10 @@ public void test_mail_settings_address_whitelist_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/address_whitelist";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/address_whitelist");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2157,11 +2107,11 @@ public void test_mail_settings_bcc_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/bcc";
-    request.body = "{\"enabled\":false,\"email\":\"email@example.com\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/bcc");
+    request.setBody("{\"enabled\":false,\"email\":\"email@example.com\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2177,10 +2127,10 @@ public void test_mail_settings_bcc_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/bcc";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/bcc");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2196,11 +2146,11 @@ public void test_mail_settings_bounce_purge_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/bounce_purge";
-    request.body = "{\"hard_bounces\":5,\"soft_bounces\":5,\"enabled\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/bounce_purge");
+    request.setBody("{\"hard_bounces\":5,\"soft_bounces\":5,\"enabled\":true}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2216,10 +2166,10 @@ public void test_mail_settings_bounce_purge_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/bounce_purge";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/bounce_purge");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2235,11 +2185,11 @@ public void test_mail_settings_footer_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/footer";
-    request.body = "{\"html_content\":\"...\",\"enabled\":true,\"plain_content\":\"...\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/footer");
+    request.setBody("{\"html_content\":\"...\",\"enabled\":true,\"plain_content\":\"...\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2255,10 +2205,10 @@ public void test_mail_settings_footer_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/footer";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/footer");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2274,11 +2224,11 @@ public void test_mail_settings_forward_bounce_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/forward_bounce";
-    request.body = "{\"enabled\":true,\"email\":\"example@example.com\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/forward_bounce");
+    request.setBody("{\"enabled\":true,\"email\":\"example@example.com\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2294,10 +2244,10 @@ public void test_mail_settings_forward_bounce_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/forward_bounce";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/forward_bounce");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2313,11 +2263,11 @@ public void test_mail_settings_forward_spam_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/forward_spam";
-    request.body = "{\"enabled\":false,\"email\":\"\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/forward_spam");
+    request.setBody("{\"enabled\":false,\"email\":\"\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2333,10 +2283,10 @@ public void test_mail_settings_forward_spam_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/forward_spam";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/forward_spam");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2352,11 +2302,11 @@ public void test_mail_settings_plain_content_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/plain_content";
-    request.body = "{\"enabled\":false}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/plain_content");
+    request.setBody("{\"enabled\":false}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2372,10 +2322,10 @@ public void test_mail_settings_plain_content_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/plain_content";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/plain_content");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2391,11 +2341,11 @@ public void test_mail_settings_spam_check_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/spam_check";
-    request.body = "{\"url\":\"url\",\"max_score\":5,\"enabled\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/spam_check");
+    request.setBody("{\"url\":\"url\",\"max_score\":5,\"enabled\":true}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2411,10 +2361,10 @@ public void test_mail_settings_spam_check_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/spam_check";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/spam_check");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2430,11 +2380,11 @@ public void test_mail_settings_template_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "mail_settings/template";
-    request.body = "{\"html_content\":\"<% body %>\",\"enabled\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("mail_settings/template");
+    request.setBody("{\"html_content\":\"<% body %>\",\"enabled\":true}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2450,10 +2400,10 @@ public void test_mail_settings_template_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mail_settings/template";
+    request.setMethod(Method.GET);
+    request.setEndpoint("mail_settings/template");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2469,18 +2419,16 @@ public void test_mailbox_providers_stats_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "mailbox_providers/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("end_date", "2016-04-01");
-      queryParams.put("mailbox_providers", "test_string");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("mailbox_providers/stats");
+    request.addQueryParam("end_date", "2016-04-01");
+    request.addQueryParam("mailbox_providers", "test_string");
+    request.addQueryParam("aggregated_by", "day");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("offset", "1");
+    request.addQueryParam("start_date", "2016-01-01");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2496,14 +2444,12 @@ public void test_partner_settings_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "partner_settings";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("partner_settings");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2519,11 +2465,11 @@ public void test_partner_settings_new_relic_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "partner_settings/new_relic";
-    request.body = "{\"enable_subuser_statistics\":true,\"enabled\":true,\"license_key\":\"\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("partner_settings/new_relic");
+    request.setBody("{\"enable_subuser_statistics\":true,\"enabled\":true,\"license_key\":\"\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2539,10 +2485,10 @@ public void test_partner_settings_new_relic_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "partner_settings/new_relic";
+    request.setMethod(Method.GET);
+    request.setEndpoint("partner_settings/new_relic");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2558,10 +2504,10 @@ public void test_scopes_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "scopes";
+    request.setMethod(Method.GET);
+    request.setEndpoint("scopes");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2577,11 +2523,11 @@ public void test_senders_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "senders";
-    request.body = "{\"city\":\"Denver\",\"from\":{\"email\":\"from@example.com\",\"name\":\"Example INC\"},\"zip\":\"80202\",\"country\":\"United States\",\"state\":\"Colorado\",\"address_2\":\"Apt. 456\",\"address\":\"123 Elm St.\",\"reply_to\":{\"email\":\"replyto@example.com\",\"name\":\"Example INC\"},\"nickname\":\"My Sender ID\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("senders");
+    request.setBody("{\"city\":\"Denver\",\"from\":{\"email\":\"from@example.com\",\"name\":\"Example INC\"},\"zip\":\"80202\",\"country\":\"United States\",\"state\":\"Colorado\",\"address_2\":\"Apt. 456\",\"address\":\"123 Elm St.\",\"reply_to\":{\"email\":\"replyto@example.com\",\"name\":\"Example INC\"},\"nickname\":\"My Sender ID\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -2597,10 +2543,10 @@ public void test_senders_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "senders";
+    request.setMethod(Method.GET);
+    request.setEndpoint("senders");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2616,11 +2562,11 @@ public void test_senders__sender_id__patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "senders/{sender_id}";
-    request.body = "{\"city\":\"Denver\",\"from\":{\"email\":\"from@example.com\",\"name\":\"Example INC\"},\"zip\":\"80202\",\"country\":\"United States\",\"state\":\"Colorado\",\"address_2\":\"Apt. 456\",\"address\":\"123 Elm St.\",\"reply_to\":{\"email\":\"replyto@example.com\",\"name\":\"Example INC\"},\"nickname\":\"My Sender ID\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("senders/{sender_id}");
+    request.setBody("{\"city\":\"Denver\",\"from\":{\"email\":\"from@example.com\",\"name\":\"Example INC\"},\"zip\":\"80202\",\"country\":\"United States\",\"state\":\"Colorado\",\"address_2\":\"Apt. 456\",\"address\":\"123 Elm St.\",\"reply_to\":{\"email\":\"replyto@example.com\",\"name\":\"Example INC\"},\"nickname\":\"My Sender ID\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2636,10 +2582,10 @@ public void test_senders__sender_id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "senders/{sender_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("senders/{sender_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2655,10 +2601,10 @@ public void test_senders__sender_id__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "senders/{sender_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("senders/{sender_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -2674,10 +2620,10 @@ public void test_senders__sender_id__resend_verification_post() throws IOExcepti
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "senders/{sender_id}/resend_verification";
+    request.setMethod(Method.POST);
+    request.setEndpoint("senders/{sender_id}/resend_verification");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -2693,17 +2639,15 @@ public void test_stats_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("stats");
+    request.addQueryParam("aggregated_by", "day");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("start_date", "2016-01-01");
+    request.addQueryParam("end_date", "2016-04-01");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2719,11 +2663,11 @@ public void test_subusers_post() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "subusers";
-    request.body = "{\"username\":\"John@example.com\",\"ips\":[\"1.1.1.1\",\"2.2.2.2\"],\"password\":\"johns_password\",\"email\":\"John@example.com\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("subusers");
+    request.setBody("{\"username\":\"John@example.com\",\"ips\":[\"1.1.1.1\",\"2.2.2.2\"],\"password\":\"johns_password\",\"email\":\"John@example.com\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2739,15 +2683,13 @@ public void test_subusers_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "subusers";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("username", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("subusers");
+    request.addQueryParam("username", "test_string");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2763,13 +2705,11 @@ public void test_subusers_reputations_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "subusers/reputations";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("usernames", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("subusers/reputations");
+    request.addQueryParam("usernames", "test_string");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2785,18 +2725,16 @@ public void test_subusers_stats_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "subusers/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("subusers", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("subusers/stats");
+    request.addQueryParam("end_date", "2016-04-01");
+    request.addQueryParam("aggregated_by", "day");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("offset", "1");
+    request.addQueryParam("start_date", "2016-01-01");
+    request.addQueryParam("subusers", "test_string");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2812,18 +2750,16 @@ public void test_subusers_stats_monthly_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "subusers/stats/monthly";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("subuser", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("sort_by_metric", "test_string");
-      queryParams.put("offset", "1");
-      queryParams.put("date", "test_string");
-      queryParams.put("sort_by_direction", "asc");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("subusers/stats/monthly");
+    request.addQueryParam("subuser", "test_string");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("sort_by_metric", "test_string");
+    request.addQueryParam("offset", "1");
+    request.addQueryParam("date", "test_string");
+    request.addQueryParam("sort_by_direction", "asc");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2839,19 +2775,17 @@ public void test_subusers_stats_sums_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "subusers/stats/sums";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("end_date", "2016-04-01");
-      queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "1");
-      queryParams.put("sort_by_metric", "test_string");
-      queryParams.put("offset", "1");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("sort_by_direction", "asc");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("subusers/stats/sums");
+    request.addQueryParam("end_date", "2016-04-01");
+    request.addQueryParam("aggregated_by", "day");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("sort_by_metric", "test_string");
+    request.addQueryParam("offset", "1");
+    request.addQueryParam("start_date", "2016-01-01");
+    request.addQueryParam("sort_by_direction", "asc");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2867,11 +2801,11 @@ public void test_subusers__subuser_name__patch() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "subusers/{subuser_name}";
-    request.body = "{\"disabled\":false}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("subusers/{subuser_name}");
+    request.setBody("{\"disabled\":false}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -2887,10 +2821,10 @@ public void test_subusers__subuser_name__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "subusers/{subuser_name}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("subusers/{subuser_name}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -2906,11 +2840,11 @@ public void test_subusers__subuser_name__ips_put() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PUT;
-    request.endpoint = "subusers/{subuser_name}/ips";
-    request.body = "[\"127.0.0.1\"]";
+    request.setMethod(Method.PUT);
+    request.setEndpoint("subusers/{subuser_name}/ips");
+    request.setBody("[\"127.0.0.1\"]");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2926,11 +2860,11 @@ public void test_subusers__subuser_name__monitor_put() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PUT;
-    request.endpoint = "subusers/{subuser_name}/monitor";
-    request.body = "{\"frequency\":500,\"email\":\"example@example.com\"}";
+    request.setMethod(Method.PUT);
+    request.setEndpoint("subusers/{subuser_name}/monitor");
+    request.setBody("{\"frequency\":500,\"email\":\"example@example.com\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2946,11 +2880,11 @@ public void test_subusers__subuser_name__monitor_post() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "subusers/{subuser_name}/monitor";
-    request.body = "{\"frequency\":50000,\"email\":\"example@example.com\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("subusers/{subuser_name}/monitor");
+    request.setBody("{\"frequency\":50000,\"email\":\"example@example.com\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2966,10 +2900,10 @@ public void test_subusers__subuser_name__monitor_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "subusers/{subuser_name}/monitor";
+    request.setMethod(Method.GET);
+    request.setEndpoint("subusers/{subuser_name}/monitor");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -2985,10 +2919,10 @@ public void test_subusers__subuser_name__monitor_delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "subusers/{subuser_name}/monitor";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("subusers/{subuser_name}/monitor");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -3004,17 +2938,15 @@ public void test_subusers__subuser_name__stats_monthly_get() throws IOException
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "subusers/{subuser_name}/stats/monthly";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("date", "test_string");
-      queryParams.put("sort_by_direction", "asc");
-      queryParams.put("limit", "1");
-      queryParams.put("sort_by_metric", "test_string");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("subusers/{subuser_name}/stats/monthly");
+    request.addQueryParam("date", "test_string");
+    request.addQueryParam("sort_by_direction", "asc");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("sort_by_metric", "test_string");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3030,16 +2962,14 @@ public void test_suppression_blocks_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/blocks";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("start_time", "1");
-      queryParams.put("limit", "1");
-      queryParams.put("end_time", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/blocks");
+    request.addQueryParam("start_time", "1");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("end_time", "1");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3055,11 +2985,11 @@ public void test_suppression_blocks_delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/blocks";
-    request.body = "{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/blocks");
+    request.setBody("{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -3075,10 +3005,10 @@ public void test_suppression_blocks__email__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/blocks/{email}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/blocks/{email}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3094,10 +3024,10 @@ public void test_suppression_blocks__email__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/blocks/{email}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/blocks/{email}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -3113,14 +3043,12 @@ public void test_suppression_bounces_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/bounces";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("start_time", "1");
-      queryParams.put("end_time", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/bounces");
+    request.addQueryParam("start_time", "1");
+    request.addQueryParam("end_time", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3136,11 +3064,11 @@ public void test_suppression_bounces_delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/bounces";
-    request.body = "{\"emails\":[\"example@example.com\",\"example2@example.com\"],\"delete_all\":true}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/bounces");
+    request.setBody("{\"emails\":[\"example@example.com\",\"example2@example.com\"],\"delete_all\":true}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -3156,10 +3084,10 @@ public void test_suppression_bounces__email__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/bounces/{email}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/bounces/{email}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3175,13 +3103,11 @@ public void test_suppression_bounces__email__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/bounces/{email}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("email_address", "example@example.com");
-    request.queryParams = queryParams;
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/bounces/{email}");
+    request.addQueryParam("email_address", "example@example.com");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -3197,16 +3123,14 @@ public void test_suppression_invalid_emails_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/invalid_emails";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("start_time", "1");
-      queryParams.put("limit", "1");
-      queryParams.put("end_time", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/invalid_emails");
+    request.addQueryParam("start_time", "1");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("end_time", "1");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3222,11 +3146,11 @@ public void test_suppression_invalid_emails_delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/invalid_emails";
-    request.body = "{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/invalid_emails");
+    request.setBody("{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -3242,10 +3166,10 @@ public void test_suppression_invalid_emails__email__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/invalid_emails/{email}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/invalid_emails/{email}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3261,10 +3185,10 @@ public void test_suppression_invalid_emails__email__delete() throws IOException
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/invalid_emails/{email}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/invalid_emails/{email}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -3280,10 +3204,10 @@ public void test_suppression_spam_report__email__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/spam_report/{email}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/spam_report/{email}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3299,10 +3223,10 @@ public void test_suppression_spam_report__email__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/spam_report/{email}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/spam_report/{email}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -3318,16 +3242,14 @@ public void test_suppression_spam_reports_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/spam_reports";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("start_time", "1");
-      queryParams.put("limit", "1");
-      queryParams.put("end_time", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/spam_reports");
+    request.addQueryParam("start_time", "1");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("end_time", "1");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3343,11 +3265,11 @@ public void test_suppression_spam_reports_delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "suppression/spam_reports";
-    request.body = "{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("suppression/spam_reports");
+    request.setBody("{\"emails\":[\"example1@example.com\",\"example2@example.com\"],\"delete_all\":false}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -3363,16 +3285,14 @@ public void test_suppression_unsubscribes_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "suppression/unsubscribes";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("start_time", "1");
-      queryParams.put("limit", "1");
-      queryParams.put("end_time", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("suppression/unsubscribes");
+    request.addQueryParam("start_time", "1");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("end_time", "1");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3388,11 +3308,11 @@ public void test_templates_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "templates";
-    request.body = "{\"name\":\"example_name\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("templates");
+    request.setBody("{\"name\":\"example_name\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -3408,10 +3328,10 @@ public void test_templates_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "templates";
+    request.setMethod(Method.GET);
+    request.setEndpoint("templates");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3427,11 +3347,11 @@ public void test_templates__template_id__patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "templates/{template_id}";
-    request.body = "{\"name\":\"new_example_name\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("templates/{template_id}");
+    request.setBody("{\"name\":\"new_example_name\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3447,10 +3367,10 @@ public void test_templates__template_id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "templates/{template_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("templates/{template_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3466,10 +3386,10 @@ public void test_templates__template_id__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "templates/{template_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("templates/{template_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -3485,11 +3405,11 @@ public void test_templates__template_id__versions_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "templates/{template_id}/versions";
-    request.body = "{\"name\":\"example_version_name\",\"html_content\":\"<%body%>\",\"plain_content\":\"<%body%>\",\"active\":1,\"template_id\":\"ddb96bbc-9b92-425e-8979-99464621b543\",\"subject\":\"<%subject%>\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("templates/{template_id}/versions");
+    request.setBody("{\"name\":\"example_version_name\",\"html_content\":\"<%body%>\",\"plain_content\":\"<%body%>\",\"active\":1,\"template_id\":\"ddb96bbc-9b92-425e-8979-99464621b543\",\"subject\":\"<%subject%>\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -3505,11 +3425,11 @@ public void test_templates__template_id__versions__version_id__patch() throws IO
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "templates/{template_id}/versions/{version_id}";
-    request.body = "{\"active\":1,\"html_content\":\"<%body%>\",\"subject\":\"<%subject%>\",\"name\":\"updated_example_name\",\"plain_content\":\"<%body%>\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("templates/{template_id}/versions/{version_id}");
+    request.setBody("{\"active\":1,\"html_content\":\"<%body%>\",\"subject\":\"<%subject%>\",\"name\":\"updated_example_name\",\"plain_content\":\"<%body%>\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3525,10 +3445,10 @@ public void test_templates__template_id__versions__version_id__get() throws IOEx
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "templates/{template_id}/versions/{version_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("templates/{template_id}/versions/{version_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3544,10 +3464,10 @@ public void test_templates__template_id__versions__version_id__delete() throws I
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "templates/{template_id}/versions/{version_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("templates/{template_id}/versions/{version_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -3563,10 +3483,10 @@ public void test_templates__template_id__versions__version_id__activate_post() t
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "templates/{template_id}/versions/{version_id}/activate";
+    request.setMethod(Method.POST);
+    request.setEndpoint("templates/{template_id}/versions/{version_id}/activate");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3582,14 +3502,12 @@ public void test_tracking_settings_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "tracking_settings";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("tracking_settings");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3605,11 +3523,11 @@ public void test_tracking_settings_click_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "tracking_settings/click";
-    request.body = "{\"enabled\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("tracking_settings/click");
+    request.setBody("{\"enabled\":true}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3625,10 +3543,10 @@ public void test_tracking_settings_click_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "tracking_settings/click";
+    request.setMethod(Method.GET);
+    request.setEndpoint("tracking_settings/click");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3644,11 +3562,11 @@ public void test_tracking_settings_google_analytics_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "tracking_settings/google_analytics";
-    request.body = "{\"utm_campaign\":\"website\",\"utm_term\":\"\",\"utm_content\":\"\",\"enabled\":true,\"utm_source\":\"sendgrid.com\",\"utm_medium\":\"email\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("tracking_settings/google_analytics");
+    request.setBody("{\"utm_campaign\":\"website\",\"utm_term\":\"\",\"utm_content\":\"\",\"enabled\":true,\"utm_source\":\"sendgrid.com\",\"utm_medium\":\"email\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3664,10 +3582,10 @@ public void test_tracking_settings_google_analytics_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "tracking_settings/google_analytics";
+    request.setMethod(Method.GET);
+    request.setEndpoint("tracking_settings/google_analytics");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3683,11 +3601,11 @@ public void test_tracking_settings_open_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "tracking_settings/open";
-    request.body = "{\"enabled\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("tracking_settings/open");
+    request.setBody("{\"enabled\":true}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3703,10 +3621,10 @@ public void test_tracking_settings_open_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "tracking_settings/open";
+    request.setMethod(Method.GET);
+    request.setEndpoint("tracking_settings/open");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3722,11 +3640,11 @@ public void test_tracking_settings_subscription_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "tracking_settings/subscription";
-    request.body = "{\"url\":\"url\",\"html_content\":\"html content\",\"enabled\":true,\"landing\":\"landing page html\",\"replace\":\"replacement tag\",\"plain_content\":\"text content\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("tracking_settings/subscription");
+    request.setBody("{\"url\":\"url\",\"html_content\":\"html content\",\"enabled\":true,\"landing\":\"landing page html\",\"replace\":\"replacement tag\",\"plain_content\":\"text content\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3742,10 +3660,10 @@ public void test_tracking_settings_subscription_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "tracking_settings/subscription";
+    request.setMethod(Method.GET);
+    request.setEndpoint("tracking_settings/subscription");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3761,10 +3679,10 @@ public void test_user_account_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/account";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/account");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3780,10 +3698,10 @@ public void test_user_credits_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/credits";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/credits");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3799,11 +3717,11 @@ public void test_user_email_put() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PUT;
-    request.endpoint = "user/email";
-    request.body = "{\"email\":\"example@example.com\"}";
+    request.setMethod(Method.PUT);
+    request.setEndpoint("user/email");
+    request.setBody("{\"email\":\"example@example.com\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3819,10 +3737,10 @@ public void test_user_email_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/email";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/email");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3838,11 +3756,11 @@ public void test_user_password_put() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PUT;
-    request.endpoint = "user/password";
-    request.body = "{\"new_password\":\"new_password\",\"old_password\":\"old_password\"}";
+    request.setMethod(Method.PUT);
+    request.setEndpoint("user/password");
+    request.setBody("{\"new_password\":\"new_password\",\"old_password\":\"old_password\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3858,11 +3776,11 @@ public void test_user_profile_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "user/profile";
-    request.body = "{\"city\":\"Orange\",\"first_name\":\"Example\",\"last_name\":\"User\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("user/profile");
+    request.setBody("{\"city\":\"Orange\",\"first_name\":\"Example\",\"last_name\":\"User\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3878,10 +3796,10 @@ public void test_user_profile_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/profile";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/profile");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3897,11 +3815,11 @@ public void test_user_scheduled_sends_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "user/scheduled_sends";
-    request.body = "{\"batch_id\":\"YOUR_BATCH_ID\",\"status\":\"pause\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("user/scheduled_sends");
+    request.setBody("{\"batch_id\":\"YOUR_BATCH_ID\",\"status\":\"pause\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -3917,10 +3835,10 @@ public void test_user_scheduled_sends_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/scheduled_sends";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/scheduled_sends");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3936,11 +3854,11 @@ public void test_user_scheduled_sends__batch_id__patch() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "user/scheduled_sends/{batch_id}";
-    request.body = "{\"status\":\"pause\"}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("user/scheduled_sends/{batch_id}");
+    request.setBody("{\"status\":\"pause\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -3956,10 +3874,10 @@ public void test_user_scheduled_sends__batch_id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/scheduled_sends/{batch_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/scheduled_sends/{batch_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -3975,10 +3893,10 @@ public void test_user_scheduled_sends__batch_id__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "user/scheduled_sends/{batch_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("user/scheduled_sends/{batch_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -3994,11 +3912,11 @@ public void test_user_settings_enforced_tls_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "user/settings/enforced_tls";
-    request.body = "{\"require_tls\":true,\"require_valid_cert\":false}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("user/settings/enforced_tls");
+    request.setBody("{\"require_tls\":true,\"require_valid_cert\":false}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4014,10 +3932,10 @@ public void test_user_settings_enforced_tls_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/settings/enforced_tls";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/settings/enforced_tls");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4033,11 +3951,11 @@ public void test_user_username_put() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PUT;
-    request.endpoint = "user/username";
-    request.body = "{\"username\":\"test_username\"}";
+    request.setMethod(Method.PUT);
+    request.setEndpoint("user/username");
+    request.setBody("{\"username\":\"test_username\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4053,10 +3971,10 @@ public void test_user_username_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/username";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/username");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4072,11 +3990,11 @@ public void test_user_webhooks_event_settings_patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "user/webhooks/event/settings";
-    request.body = "{\"group_resubscribe\":true,\"delivered\":true,\"group_unsubscribe\":true,\"spam_report\":true,\"url\":\"url\",\"enabled\":true,\"bounce\":true,\"deferred\":true,\"unsubscribe\":true,\"dropped\":true,\"open\":true,\"click\":true,\"processed\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("user/webhooks/event/settings");
+    request.setBody("{\"group_resubscribe\":true,\"delivered\":true,\"group_unsubscribe\":true,\"spam_report\":true,\"url\":\"url\",\"enabled\":true,\"bounce\":true,\"deferred\":true,\"unsubscribe\":true,\"dropped\":true,\"open\":true,\"click\":true,\"processed\":true}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4092,10 +4010,10 @@ public void test_user_webhooks_event_settings_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/webhooks/event/settings";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/webhooks/event/settings");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4111,11 +4029,11 @@ public void test_user_webhooks_event_test_post() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "user/webhooks/event/test";
-    request.body = "{\"url\":\"url\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("user/webhooks/event/test");
+    request.setBody("{\"url\":\"url\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -4131,11 +4049,11 @@ public void test_user_webhooks_parse_settings_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "user/webhooks/parse/settings";
-    request.body = "{\"url\":\"http://email.myhosthame.com\",\"send_raw\":false,\"hostname\":\"myhostname.com\",\"spam_check\":true}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("user/webhooks/parse/settings");
+    request.setBody("{\"url\":\"http://email.myhosthame.com\",\"send_raw\":false,\"hostname\":\"myhostname.com\",\"spam_check\":true}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -4151,10 +4069,10 @@ public void test_user_webhooks_parse_settings_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/webhooks/parse/settings";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/webhooks/parse/settings");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4170,11 +4088,11 @@ public void test_user_webhooks_parse_settings__hostname__patch() throws IOExcept
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "user/webhooks/parse/settings/{hostname}";
-    request.body = "{\"url\":\"http://newdomain.com/parse\",\"send_raw\":true,\"spam_check\":false}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("user/webhooks/parse/settings/{hostname}");
+    request.setBody("{\"url\":\"http://newdomain.com/parse\",\"send_raw\":true,\"spam_check\":false}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4190,10 +4108,10 @@ public void test_user_webhooks_parse_settings__hostname__get() throws IOExceptio
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/webhooks/parse/settings/{hostname}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/webhooks/parse/settings/{hostname}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4209,10 +4127,10 @@ public void test_user_webhooks_parse_settings__hostname__delete() throws IOExcep
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "user/webhooks/parse/settings/{hostname}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("user/webhooks/parse/settings/{hostname}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -4228,17 +4146,15 @@ public void test_user_webhooks_parse_stats_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "user/webhooks/parse/stats";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("aggregated_by", "day");
-      queryParams.put("limit", "test_string");
-      queryParams.put("start_date", "2016-01-01");
-      queryParams.put("end_date", "2016-04-01");
-      queryParams.put("offset", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("user/webhooks/parse/stats");
+    request.addQueryParam("aggregated_by", "day");
+    request.addQueryParam("limit", "test_string");
+    request.addQueryParam("start_date", "2016-01-01");
+    request.addQueryParam("end_date", "2016-04-01");
+    request.addQueryParam("offset", "test_string");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4254,11 +4170,11 @@ public void test_whitelabel_domains_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/domains";
-    request.body = "{\"automatic_security\":false,\"username\":\"john@example.com\",\"domain\":\"example.com\",\"default\":true,\"custom_spf\":true,\"ips\":[\"192.168.1.1\",\"192.168.1.2\"],\"subdomain\":\"news\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/domains");
+    request.setBody("{\"automatic_security\":false,\"username\":\"john@example.com\",\"domain\":\"example.com\",\"default\":true,\"custom_spf\":true,\"ips\":[\"192.168.1.1\",\"192.168.1.2\"],\"subdomain\":\"news\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -4274,17 +4190,15 @@ public void test_whitelabel_domains_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/domains";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("username", "test_string");
-      queryParams.put("domain", "test_string");
-      queryParams.put("exclude_subusers", "true");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/domains");
+    request.addQueryParam("username", "test_string");
+    request.addQueryParam("domain", "test_string");
+    request.addQueryParam("exclude_subusers", "true");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4300,10 +4214,10 @@ public void test_whitelabel_domains_default_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/domains/default";
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/domains/default");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4319,10 +4233,10 @@ public void test_whitelabel_domains_subuser_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/domains/subuser";
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/domains/subuser");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4338,10 +4252,10 @@ public void test_whitelabel_domains_subuser_delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "whitelabel/domains/subuser";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("whitelabel/domains/subuser");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -4357,11 +4271,11 @@ public void test_whitelabel_domains__domain_id__patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "whitelabel/domains/{domain_id}";
-    request.body = "{\"default\":false,\"custom_spf\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("whitelabel/domains/{domain_id}");
+    request.setBody("{\"default\":false,\"custom_spf\":true}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4377,10 +4291,10 @@ public void test_whitelabel_domains__domain_id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/domains/{domain_id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/domains/{domain_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4396,10 +4310,10 @@ public void test_whitelabel_domains__domain_id__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "whitelabel/domains/{domain_id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("whitelabel/domains/{domain_id}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -4415,11 +4329,11 @@ public void test_whitelabel_domains__domain_id__subuser_post() throws IOExceptio
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/domains/{domain_id}/subuser";
-    request.body = "{\"username\":\"jane@example.com\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/domains/{domain_id}/subuser");
+    request.setBody("{\"username\":\"jane@example.com\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -4435,11 +4349,11 @@ public void test_whitelabel_domains__id__ips_post() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/domains/{id}/ips";
-    request.body = "{\"ip\":\"192.168.0.1\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/domains/{id}/ips");
+    request.setBody("{\"ip\":\"192.168.0.1\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4455,10 +4369,10 @@ public void test_whitelabel_domains__id__ips__ip__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "whitelabel/domains/{id}/ips/{ip}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("whitelabel/domains/{id}/ips/{ip}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4474,10 +4388,10 @@ public void test_whitelabel_domains__id__validate_post() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/domains/{id}/validate";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/domains/{id}/validate");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4493,11 +4407,11 @@ public void test_whitelabel_ips_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/ips";
-    request.body = "{\"ip\":\"192.168.1.1\",\"domain\":\"example.com\",\"subdomain\":\"email\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/ips");
+    request.setBody("{\"ip\":\"192.168.1.1\",\"domain\":\"example.com\",\"subdomain\":\"email\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -4513,15 +4427,13 @@ public void test_whitelabel_ips_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/ips";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("ip", "test_string");
-      queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/ips");
+    request.addQueryParam("ip", "test_string");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4537,10 +4449,10 @@ public void test_whitelabel_ips__id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/ips/{id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/ips/{id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4556,10 +4468,10 @@ public void test_whitelabel_ips__id__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "whitelabel/ips/{id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("whitelabel/ips/{id}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -4575,10 +4487,10 @@ public void test_whitelabel_ips__id__validate_post() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/ips/{id}/validate";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/ips/{id}/validate");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4594,15 +4506,13 @@ public void test_whitelabel_links_post() throws IOException {
     sg.addRequestHeader("X-Mock", "201");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/links";
-    request.body = "{\"default\":true,\"domain\":\"example.com\",\"subdomain\":\"mail\"}";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-      queryParams.put("offset", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/links");
+    request.setBody("{\"default\":true,\"domain\":\"example.com\",\"subdomain\":\"mail\"}");
+    request.addQueryParam("limit", "1");
+    request.addQueryParam("offset", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(201, response.statusCode);
+    Assert.assertEquals(201, response.getStatusCode());
   }
 
   @Test
@@ -4618,13 +4528,11 @@ public void test_whitelabel_links_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/links";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("limit", "1");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/links");
+    request.addQueryParam("limit", "1");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4640,13 +4548,11 @@ public void test_whitelabel_links_default_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/links/default";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("domain", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/links/default");
+    request.addQueryParam("domain", "test_string");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4662,13 +4568,11 @@ public void test_whitelabel_links_subuser_get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/links/subuser";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("username", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/links/subuser");
+    request.addQueryParam("username", "test_string");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4684,13 +4588,11 @@ public void test_whitelabel_links_subuser_delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "whitelabel/links/subuser";
-    Map<String,String> queryParams = new HashMap<String, String>();
-    queryParams.put("username", "test_string");
-    request.queryParams = queryParams;
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("whitelabel/links/subuser");
+    request.addQueryParam("username", "test_string");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -4706,11 +4608,11 @@ public void test_whitelabel_links__id__patch() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.PATCH;
-    request.endpoint = "whitelabel/links/{id}";
-    request.body = "{\"default\":true}";
+    request.setMethod(Method.PATCH);
+    request.setEndpoint("whitelabel/links/{id}");
+    request.setBody("{\"default\":true}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4726,10 +4628,10 @@ public void test_whitelabel_links__id__get() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.GET;
-    request.endpoint = "whitelabel/links/{id}";
+    request.setMethod(Method.GET);
+    request.setEndpoint("whitelabel/links/{id}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4745,10 +4647,10 @@ public void test_whitelabel_links__id__delete() throws IOException {
     sg.addRequestHeader("X-Mock", "204");
 
     Request request = new Request();
-    request.method = Method.DELETE;
-    request.endpoint = "whitelabel/links/{id}";
+    request.setMethod(Method.DELETE);
+    request.setEndpoint("whitelabel/links/{id}");
     Response response = sg.api(request);
-    Assert.assertEquals(204, response.statusCode);
+    Assert.assertEquals(204, response.getStatusCode());
   }
 
   @Test
@@ -4764,10 +4666,10 @@ public void test_whitelabel_links__id__validate_post() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/links/{id}/validate";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/links/{id}/validate");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
   @Test
@@ -4783,11 +4685,11 @@ public void test_whitelabel_links__link_id__subuser_post() throws IOException {
     sg.addRequestHeader("X-Mock", "200");
 
     Request request = new Request();
-    request.method = Method.POST;
-    request.endpoint = "whitelabel/links/{link_id}/subuser";
-    request.body = "{\"username\":\"jane@example.com\"}";
+    request.setMethod(Method.POST);
+    request.setEndpoint("whitelabel/links/{link_id}/subuser");
+    request.setBody("{\"username\":\"jane@example.com\"}");
     Response response = sg.api(request);
-    Assert.assertEquals(200, response.statusCode);
+    Assert.assertEquals(200, response.getStatusCode());
   }
 
 }