diff --git a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
index 5948116ac..8b8afeb7c 100644
--- a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
+++ b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
@@ -54,21 +54,9 @@ import com.omertron.themoviedbapi.model.Video;
 import com.omertron.themoviedbapi.results.TmdbResultsList;
 import com.omertron.themoviedbapi.results.TmdbResultsMap;
 import com.omertron.themoviedbapi.tools.ApiUrl;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_ADULT;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_COUNTRY;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_END_DATE;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_ID;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_INCLUDE_ALL_MOVIES;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_LANGUAGE;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_PAGE;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_PASSWORD;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_QUERY;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_SESSION;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_START_DATE;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_TOKEN;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_USERNAME;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_YEAR;
 import com.omertron.themoviedbapi.tools.HttpTools;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
 import com.omertron.themoviedbapi.wrapper.WrapperAlternativeTitles;
 import com.omertron.themoviedbapi.wrapper.WrapperChanges;
 import com.omertron.themoviedbapi.wrapper.WrapperCollection;
@@ -110,7 +98,8 @@ import org.yamj.api.common.http.SimpleHttpClientBuilder;
 /**
  * The MovieDb API
  * <p>
- * This is for version 3 of the API as specified here: http://help.themoviedb.org/kb/api/about-3
+ * This is for version 3 of the API as specified here:
+ * http://help.themoviedb.org/kb/api/about-3
  *
  * @author stuart.boston
  */
@@ -164,8 +153,7 @@ public class TheMovieDbApi {
         this.apiKey = apiKey;
         this.httpTools = new HttpTools(httpClient);
 
-        ApiUrl apiUrl = new ApiUrl(apiKey, "configuration");
-        URL configUrl = apiUrl.buildUrl();
+        URL configUrl = new ApiUrl(apiKey, "configuration").buildUrl();
         String webpage = httpTools.getRequest(configUrl);
 
         try {
@@ -194,7 +182,8 @@ public class TheMovieDbApi {
      * @param moviedb The moviedb object to compare too
      * @param title The title of the movie to compare
      * @param year The year of the movie to compare
-     * @param maxDistance The Levenshtein Distance between the two titles. 0 = exact match
+     * @param maxDistance The Levenshtein Distance between the two titles. 0 =
+     * exact match
      * @param caseSensitive true if the comparison is to be case sensitive
      * @return True if there is a match, False otherwise.
      */
@@ -310,21 +299,24 @@ public class TheMovieDbApi {
 
     //<editor-fold defaultstate="collapsed" desc="Authentication Functions">
     /**
-     * This method is used to generate a valid request token for user based authentication.
+     * This method is used to generate a valid request token for user based
+     * authentication.
      *
      * A request token is required in order to request a session id.
      *
-     * You can generate any number of request tokens but they will expire after 60 minutes.
+     * You can generate any number of request tokens but they will expire after
+     * 60 minutes.
      *
-     * As soon as a valid session id has been created the token will be destroyed.
+     * As soon as a valid session id has been created the token will be
+     * destroyed.
      *
      * @return
      * @throws MovieDbException
      */
     public TokenAuthorisation getAuthorisationToken() throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_AUTH, "token/new");
+        TmdbParameters parameters = new TmdbParameters();
+        URL url = new ApiUrl(apiKey, BASE_AUTH).setSubMethod("token/new").buildUrl(parameters);
 
-        URL url = apiUrl.buildUrl();
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -336,7 +328,8 @@ public class TheMovieDbApi {
     }
 
     /**
-     * This method is used to generate a session id for user based authentication.
+     * This method is used to generate a session id for user based
+     * authentication.
      *
      * A session id is required in order to use any of the write methods.
      *
@@ -345,15 +338,15 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TokenSession getSessionToken(TokenAuthorisation token) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_AUTH, "session/new");
+        TmdbParameters parameters = new TmdbParameters();
 
         if (!token.getSuccess()) {
             LOG.warn("Session token was not successful!");
-            throw new MovieDbException(ApiExceptionType.AUTH_FAILURE, "Authorisation token was not successful!", apiUrl.buildUrl());
+            throw new MovieDbException(ApiExceptionType.AUTH_FAILURE, "Authorisation token was not successful!");
         }
 
-        apiUrl.addArgument(PARAM_TOKEN, token.getRequestToken());
-        URL url = apiUrl.buildUrl();
+        parameters.add(Param.TOKEN, token.getRequestToken());
+        URL url = new ApiUrl(apiKey, BASE_AUTH).setSubMethod("session/new").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -365,7 +358,8 @@ public class TheMovieDbApi {
     }
 
     /**
-     * This method is used to generate a session id for user based authentication. User must provide their username and password
+     * This method is used to generate a session id for user based
+     * authentication. User must provide their username and password
      *
      * A session id is required in order to use any of the write methods.
      *
@@ -376,18 +370,18 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TokenAuthorisation getSessionTokenLogin(TokenAuthorisation token, String username, String password) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_AUTH, "token/validate_with_login");
+        TmdbParameters parameters = new TmdbParameters();
 
         if (!token.getSuccess()) {
             LOG.warn("Session token was not successful!");
-            throw new MovieDbException(ApiExceptionType.AUTH_FAILURE, "Authorisation token was not successful!", apiUrl.buildUrl());
+            throw new MovieDbException(ApiExceptionType.AUTH_FAILURE, "Authorisation token was not successful!");
         }
 
-        apiUrl.addArgument(PARAM_TOKEN, token.getRequestToken());
-        apiUrl.addArgument(PARAM_USERNAME, username);
-        apiUrl.addArgument(PARAM_PASSWORD, password);
+        parameters.add(Param.TOKEN, token.getRequestToken());
+        parameters.add(Param.USERNAME, username);
+        parameters.add(Param.PASSWORD, password);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_AUTH).setSubMethod("token/validate_with_login").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -401,22 +395,24 @@ public class TheMovieDbApi {
     /**
      * This method is used to generate a guest session id.
      *
-     * A guest session can be used to rate movies without having a registered TMDb user account.
+     * A guest session can be used to rate movies without having a registered
+     * TMDb user account.
      *
-     * You should only generate a single guest session per user (or device) as you will be able to attach the ratings to a TMDb user
-     * account in the future.
+     * You should only generate a single guest session per user (or device) as
+     * you will be able to attach the ratings to a TMDb user account in the
+     * future.
      *
-     * There are also IP limits in place so you should always make sure it's the end user doing the guest session actions.
+     * There are also IP limits in place so you should always make sure it's the
+     * end user doing the guest session actions.
      *
-     * If a guest session is not used for the first time within 24 hours, it will be automatically discarded.
+     * If a guest session is not used for the first time within 24 hours, it
+     * will be automatically discarded.
      *
      * @return
      * @throws MovieDbException
      */
     public TokenSession getGuestSessionToken() throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_AUTH, "guest_session/new");
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_AUTH).setSubMethod("guest_session/new").buildUrl();
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -428,18 +424,18 @@ public class TheMovieDbApi {
     }
 
     /**
-     * Get the basic information for an account. You will need to have a valid session id.
+     * Get the basic information for an account. You will need to have a valid
+     * session id.
      *
      * @param sessionId
      * @return
      * @throws MovieDbException
      */
     public Account getAccount(String sessionId) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_ACCOUNT.replace("/", ""));
-
-        apiUrl.addArgument(PARAM_SESSION, sessionId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION, sessionId);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_ACCOUNT.replace("/", "")).buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -450,11 +446,19 @@ public class TheMovieDbApi {
         }
     }
 
+    /**
+     * Get the account favourite movies
+     *
+     * @param sessionId
+     * @param accountId
+     * @return
+     * @throws MovieDbException
+     */
     public List<MovieDb> getFavoriteMovies(String sessionId, int accountId) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_ACCOUNT, accountId + "/favorite_movies");
-        apiUrl.addArgument(PARAM_SESSION, sessionId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION, sessionId);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_ACCOUNT).setSubMethod(accountId, "/favorite_movies").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -466,16 +470,15 @@ public class TheMovieDbApi {
     }
 
     public StatusCode changeFavoriteStatus(String sessionId, int accountId, Integer movieId, boolean isFavorite) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_ACCOUNT, accountId + "/favorite");
-
-        apiUrl.addArgument(PARAM_SESSION, sessionId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION, sessionId);
 
         Map<String, Object> body = new HashMap<String, Object>();
         body.put(MOVIE_ID, movieId);
         body.put("favorite", isFavorite);
         String jsonBody = convertToJson(body);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_ACCOUNT).setSubMethod(accountId, "/favorite").buildUrl(parameters);
         String webpage = httpTools.postRequest(url, jsonBody);
 
         try {
@@ -513,16 +516,15 @@ public class TheMovieDbApi {
     }
 
     private StatusCode modifyWatchList(String sessionId, int accountId, Integer movieId, boolean add) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_ACCOUNT, accountId + "/movie_watchlist");
-
-        apiUrl.addArgument(PARAM_SESSION, sessionId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION, sessionId);
 
         Map<String, Object> body = new HashMap<String, Object>();
         body.put(MOVIE_ID, movieId);
         body.put("movie_watchlist", add);
         String jsonBody = convertToJson(body);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_ACCOUNT).setSubMethod(accountId, "/movie_watchlist").buildUrl(parameters);
         String webpage = httpTools.postRequest(url, jsonBody);
 
         try {
@@ -540,7 +542,8 @@ public class TheMovieDbApi {
      *
      * It will return the single highest rated poster and backdrop.
      *
-     * ApiExceptionType.MOVIE_ID_NOT_FOUND will be thrown if there are no movies found.
+     * ApiExceptionType.MOVIE_ID_NOT_FOUND will be thrown if there are no movies
+     * found.
      *
      * @param movieId
      * @param language
@@ -549,17 +552,12 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public MovieDb getMovieInfo(int movieId, String language, String... appendToResponse) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE);
-
-        apiUrl.addArgument(PARAM_ID, movieId);
-
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        apiUrl.appendToResponse(appendToResponse);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.APPEND, appendToResponse);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
         try {
             MovieDb movie = mapper.readValue(webpage, MovieDb.class);
@@ -579,7 +577,8 @@ public class TheMovieDbApi {
      *
      * It will return the single highest rated poster and backdrop.
      *
-     * ApiExceptionType.MOVIE_ID_NOT_FOUND will be thrown if there are no movies found.
+     * ApiExceptionType.MOVIE_ID_NOT_FOUND will be thrown if there are no movies
+     * found.
      *
      * @param imdbId
      * @param language
@@ -588,18 +587,14 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public MovieDb getMovieInfoImdb(String imdbId, String language, String... appendToResponse) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE);
-
-        apiUrl.addArgument(PARAM_ID, imdbId);
-
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        apiUrl.appendToResponse(appendToResponse);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, imdbId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.APPEND, appendToResponse);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
+
         try {
             MovieDb movie = mapper.readValue(webpage, MovieDb.class);
             if (movie == null || movie.getId() == 0) {
@@ -614,7 +609,8 @@ public class TheMovieDbApi {
     }
 
     /**
-     * This method is used to retrieve all of the alternative titles we have for a particular movie.
+     * This method is used to retrieve all of the alternative titles we have for
+     * a particular movie.
      *
      * @param movieId
      * @param country
@@ -623,16 +619,12 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<AlternativeTitle> getMovieAlternativeTitles(int movieId, String country, String... appendToResponse) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "/alternative_titles");
-        apiUrl.addArgument(PARAM_ID, movieId);
-
-        if (StringUtils.isNotBlank(country)) {
-            apiUrl.addArgument(PARAM_COUNTRY, country);
-        }
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.COUNTRY, country);
+        parameters.add(Param.APPEND, appendToResponse);
 
-        apiUrl.appendToResponse(appendToResponse);
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("/alternative_titles").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
         try {
             WrapperAlternativeTitles wrapper = mapper.readValue(webpage, WrapperAlternativeTitles.class);
@@ -656,12 +648,11 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<Person> getMovieCasts(int movieId, String... appendToResponse) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "/casts");
-        apiUrl.addArgument(PARAM_ID, movieId);
-
-        apiUrl.appendToResponse(appendToResponse);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.APPEND, appendToResponse);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("casts").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -676,7 +667,8 @@ public class TheMovieDbApi {
     }
 
     /**
-     * This method should be used when you’re wanting to retrieve all of the images for a particular movie.
+     * This method should be used when you’re wanting to retrieve all of the
+     * images for a particular movie.
      *
      * @param movieId
      * @param language
@@ -685,16 +677,12 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<Artwork> getMovieImages(int movieId, String language, String... appendToResponse) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, URL_IMAGES);
-        apiUrl.addArgument(PARAM_ID, movieId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.APPEND, appendToResponse);
 
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        apiUrl.appendToResponse(appendToResponse);
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod(URL_IMAGES).buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -709,7 +697,8 @@ public class TheMovieDbApi {
     }
 
     /**
-     * This method is used to retrieve all of the keywords that have been added to a particular movie.
+     * This method is used to retrieve all of the keywords that have been added
+     * to a particular movie.
      *
      * Currently, only English keywords exist.
      *
@@ -719,12 +708,11 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<Keyword> getMovieKeywords(int movieId, String... appendToResponse) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "/keywords");
-        apiUrl.addArgument(PARAM_ID, movieId);
-
-        apiUrl.appendToResponse(appendToResponse);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.APPEND, appendToResponse);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("keywords").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -739,7 +727,8 @@ public class TheMovieDbApi {
     }
 
     /**
-     * This method is used to retrieve all of the release and certification data we have for a specific movie.
+     * This method is used to retrieve all of the release and certification data
+     * we have for a specific movie.
      *
      * @param movieId
      * @param language
@@ -748,13 +737,12 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<ReleaseInfo> getMovieReleaseInfo(int movieId, String language, String... appendToResponse) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "/releases");
-        apiUrl.addArgument(PARAM_ID, movieId);
-        apiUrl.addArgument(PARAM_LANGUAGE, language);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.APPEND, appendToResponse);
 
-        apiUrl.appendToResponse(appendToResponse);
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("releases").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -769,7 +757,8 @@ public class TheMovieDbApi {
     }
 
     /**
-     * This method is used to retrieve all of the trailers for a particular movie.
+     * This method is used to retrieve all of the trailers for a particular
+     * movie.
      *
      * Supported sites are YouTube and QuickTime.
      *
@@ -780,16 +769,12 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<Video> getMovieTrailers(int movieId, String language, String... appendToResponse) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "/videos");
-        apiUrl.addArgument(PARAM_ID, movieId);
-
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.APPEND, appendToResponse);
 
-        apiUrl.appendToResponse(appendToResponse);
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("videos").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -804,7 +789,8 @@ public class TheMovieDbApi {
     }
 
     /**
-     * This method is used to retrieve a list of the available translations for a specific movie.
+     * This method is used to retrieve a list of the available translations for
+     * a specific movie.
      *
      * @param movieId
      * @param appendToResponse
@@ -812,12 +798,11 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<Translation> getMovieTranslations(int movieId, String... appendToResponse) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "/translations");
-        apiUrl.addArgument(PARAM_ID, movieId);
-
-        apiUrl.appendToResponse(appendToResponse);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.APPEND, appendToResponse);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("translations").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -832,9 +817,11 @@ public class TheMovieDbApi {
     }
 
     /**
-     * The similar movies method will let you retrieve the similar movies for a particular movie.
+     * The similar movies method will let you retrieve the similar movies for a
+     * particular movie.
      *
-     * This data is created dynamically but with the help of users votes on TMDb.
+     * This data is created dynamically but with the help of users votes on
+     * TMDb.
      *
      * The data is much better with movies that have more keywords
      *
@@ -846,20 +833,13 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<MovieDb> getSimilarMovies(int movieId, String language, int page, String... appendToResponse) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "/similar_movies");
-        apiUrl.addArgument(PARAM_ID, movieId);
-
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, page);
-        }
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.APPEND, appendToResponse);
 
-        apiUrl.appendToResponse(appendToResponse);
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("similar_movies").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -874,20 +854,13 @@ public class TheMovieDbApi {
     }
 
     public TmdbResultsList<Reviews> getReviews(int movieId, String language, int page, String... appendToResponse) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "/reviews");
-        apiUrl.addArgument(PARAM_ID, movieId);
-
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, page);
-        }
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.APPEND, appendToResponse);
 
-        apiUrl.appendToResponse(appendToResponse);
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("reviews").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -912,20 +885,13 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<MovieList> getMovieLists(int movieId, String language, int page, String... appendToResponse) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "/lists");
-        apiUrl.addArgument(PARAM_ID, movieId);
-
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, page);
-        }
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.APPEND, appendToResponse);
 
-        apiUrl.appendToResponse(appendToResponse);
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("lists").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -946,11 +912,13 @@ public class TheMovieDbApi {
      *
      * By default, only the last 24 hours of changes are returned.
      *
-     * The maximum number of days that can be returned in a single request is 14.
+     * The maximum number of days that can be returned in a single request is
+     * 14.
      *
      * The language is present on fields that are translatable.
      *
-     * TODO: DOES NOT WORK AT THE MOMENT. This is due to the "value" item changing type in the ChangeItem
+     * TODO: DOES NOT WORK AT THE MOMENT. This is due to the "value" item
+     * changing type in the ChangeItem
      *
      * @param movieId
      * @param startDate the start date of the changes, optional
@@ -959,18 +927,12 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsMap<String, List<ChangedItem>> getMovieChanges(int movieId, String startDate, String endDate) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "/changes");
-        apiUrl.addArgument(PARAM_ID, movieId);
-
-        if (StringUtils.isNotBlank(startDate)) {
-            apiUrl.addArgument(PARAM_START_DATE, startDate);
-        }
-
-        if (StringUtils.isNotBlank(endDate)) {
-            apiUrl.addArgument(PARAM_END_DATE, endDate);
-        }
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
+        parameters.add(Param.START_DATE, startDate);
+        parameters.add(Param.END_DATE, endDate);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("changes").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
         try {
             WrapperChanges wrapper = mapper.readValue(webpage, WrapperChanges.class);
@@ -995,8 +957,7 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public MovieDb getLatestMovie() throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "/latest");
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("latest").buildUrl();
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1020,17 +981,11 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<MovieDb> getUpcoming(String language, int page) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "upcoming");
-
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, page);
-        }
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("upcoming").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1048,7 +1003,8 @@ public class TheMovieDbApi {
     /**
      * This method is used to retrieve the movies currently in theatres.
      *
-     * This is a curated list that will normally contain 100 movies. The default response will return 20 movies.
+     * This is a curated list that will normally contain 100 movies. The default
+     * response will return 20 movies.
      *
      * TODO: Implement more than 20 movies
      *
@@ -1058,17 +1014,11 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<MovieDb> getNowPlayingMovies(String language, int page) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "now-playing");
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
 
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, page);
-        }
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("now-playing").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1095,17 +1045,11 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<MovieDb> getPopularMovieList(String language, int page) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "popular");
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
 
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, page);
-        }
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("popular").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1120,7 +1064,8 @@ public class TheMovieDbApi {
     }
 
     /**
-     * This method is used to retrieve the top rated movies that have over 10 votes on TMDb.
+     * This method is used to retrieve the top rated movies that have over 10
+     * votes on TMDb.
      *
      * The default response will return 20 movies.
      *
@@ -1132,17 +1077,11 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<MovieDb> getTopRatedMovies(String language, int page) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "top-rated");
-
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, page);
-        }
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("top-rated").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1165,10 +1104,10 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public List<MovieDb> getRatedMovies(String sessionId, int accountId) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_ACCOUNT, accountId + "/rated/movies");
-        apiUrl.addArgument(PARAM_SESSION, sessionId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION, sessionId);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_ACCOUNT).setSubMethod(accountId, "/rated/movies").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1191,17 +1130,16 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public boolean postMovieRating(String sessionId, Integer movieId, Integer rating) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, movieId + "/rating");
-
-        apiUrl.addArgument(PARAM_SESSION, sessionId);
-
         if (rating < 0 || rating > RATING_MAX) {
-            throw new MovieDbException(ApiExceptionType.UNKNOWN_CAUSE, "Rating out of range", apiUrl.buildUrl());
+            throw new MovieDbException(ApiExceptionType.UNKNOWN_CAUSE, "Rating out of range");
         }
 
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION, sessionId);
+
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod(movieId, "/rating").buildUrl(parameters);
+
         String jsonBody = convertToJson(Collections.singletonMap("value", rating));
-        LOG.debug("Body: {}", jsonBody);
-        URL url = apiUrl.buildUrl();
         String webpage = httpTools.postRequest(url, jsonBody);
 
         try {
@@ -1218,9 +1156,11 @@ public class TheMovieDbApi {
 
     //<editor-fold defaultstate="collapsed" desc="Collection Functions">
     /**
-     * This method is used to retrieve all of the basic information about a movie collection.
+     * This method is used to retrieve all of the basic information about a
+     * movie collection.
      *
-     * You can get the ID needed for this method by making a getMovieInfo request for the belongs_to_collection.
+     * You can get the ID needed for this method by making a getMovieInfo
+     * request for the belongs_to_collection.
      *
      * @param collectionId
      * @param language
@@ -1228,14 +1168,11 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public CollectionInfo getCollectionInfo(int collectionId, String language) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_COLLECTION);
-        apiUrl.addArgument(PARAM_ID, collectionId);
-
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, collectionId);
+        parameters.add(Param.LANGUAGE, language);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_COLLECTION).buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1255,14 +1192,11 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<Artwork> getCollectionImages(int collectionId, String language) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_COLLECTION, URL_IMAGES);
-        apiUrl.addArgument(PARAM_ID, collectionId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, collectionId);
+        parameters.add(Param.LANGUAGE, language);
 
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_COLLECTION).setSubMethod(URL_IMAGES).buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1289,12 +1223,11 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public Person getPersonInfo(int personId, String... appendToResponse) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_PERSON);
-
-        apiUrl.addArgument(PARAM_ID, personId);
-        apiUrl.appendToResponse(appendToResponse);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, personId);
+        parameters.add(Param.APPEND, appendToResponse);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_PERSON).buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1306,7 +1239,8 @@ public class TheMovieDbApi {
     }
 
     /**
-     * This method is used to retrieve all of the cast & crew information for the person.
+     * This method is used to retrieve all of the cast & crew information for
+     * the person.
      *
      * It will return the single highest rated poster for each movie record.
      *
@@ -1316,12 +1250,11 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<PersonCredit> getPersonCredits(int personId, String... appendToResponse) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_PERSON, "/credits");
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, personId);
+        parameters.add(Param.APPEND, appendToResponse);
 
-        apiUrl.addArgument(PARAM_ID, personId);
-        apiUrl.appendToResponse(appendToResponse);
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_PERSON).setSubMethod("credits").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1343,11 +1276,10 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<Artwork> getPersonImages(int personId) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_PERSON, URL_IMAGES);
-
-        apiUrl.addArgument(PARAM_ID, personId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, personId);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_PERSON).setSubMethod(URL_IMAGES).buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1368,7 +1300,8 @@ public class TheMovieDbApi {
      *
      * By default, only the last 24 hours of changes are returned.
      *
-     * The maximum number of days that can be returned in a single request is 14.
+     * The maximum number of days that can be returned in a single request is
+     * 14.
      *
      * The language is present on fields that are translatable.
      *
@@ -1404,13 +1337,10 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<Person> getPersonPopular(int page) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_PERSON, "/popular");
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.PAGE, page);
 
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, page);
-        }
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_PERSON).setSubMethod("popular").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1431,8 +1361,7 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public Person getPersonLatest() throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_PERSON, "/latest");
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_PERSON).setSubMethod("latest").buildUrl();
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1446,18 +1375,18 @@ public class TheMovieDbApi {
 
     //<editor-fold defaultstate="collapsed" desc="Company Functions">
     /**
-     * This method is used to retrieve the basic information about a production company on TMDb.
+     * This method is used to retrieve the basic information about a production
+     * company on TMDb.
      *
      * @param companyId
      * @return
      * @throws MovieDbException
      */
     public Company getCompanyInfo(int companyId) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_COMPANY);
-
-        apiUrl.addArgument(PARAM_ID, companyId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, companyId);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_COMPANY).buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1471,7 +1400,8 @@ public class TheMovieDbApi {
     /**
      * This method is used to retrieve the movies associated with a company.
      *
-     * These movies are returned in order of most recently released to oldest. The default response will return 20 movies per page.
+     * These movies are returned in order of most recently released to oldest.
+     * The default response will return 20 movies per page.
      *
      * TODO: Implement more than 20 movies
      *
@@ -1482,19 +1412,12 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<MovieDb> getCompanyMovies(int companyId, String language, int page) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_COMPANY, URL_MOVIES);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, companyId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
 
-        apiUrl.addArgument(PARAM_ID, companyId);
-
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, page);
-        }
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_COMPANY).setSubMethod(URL_MOVIES).buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1520,10 +1443,10 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<Genre> getGenreList(String language) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_GENRE, "/list");
-        apiUrl.addArgument(PARAM_LANGUAGE, language);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.LANGUAGE, language);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_GENRE).setSubMethod("list").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1540,9 +1463,11 @@ public class TheMovieDbApi {
     /**
      * Get a list of movies per genre.
      *
-     * It is important to understand that only movies with more than 10 votes get listed.
+     * It is important to understand that only movies with more than 10 votes
+     * get listed.
      *
-     * This prevents movies from 1 10/10 rating from being listed first and for the first 5 pages.
+     * This prevents movies from 1 10/10 rating from being listed first and for
+     * the first 5 pages.
      *
      * @param genreId
      * @param language
@@ -1552,20 +1477,13 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<MovieDb> getGenreMovies(int genreId, String language, int page, boolean includeAllMovies) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_GENRE, URL_MOVIES);
-        apiUrl.addArgument(PARAM_ID, genreId);
-
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, genreId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
+        parameters.add(Param.INCLUDE_ALL_MOVIES, includeAllMovies);
 
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, page);
-        }
-
-        apiUrl.addArgument(PARAM_INCLUDE_ALL_MOVIES, includeAllMovies);
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_GENRE).setSubMethod(URL_MOVIES).buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1582,39 +1500,30 @@ public class TheMovieDbApi {
 
     //<editor-fold defaultstate="collapsed" desc="Search Functions">
     /**
-     * Search Movies This is a good starting point to start finding movies on TMDb.
+     * Search Movies This is a good starting point to start finding movies on
+     * TMDb.
      *
      * @param movieName
-     * @param searchYear Limit the search to the provided year. Zero (0) will get all years
+     * @param searchYear Limit the search to the provided year. Zero (0) will
+     * get all years
      * @param language The language to include. Can be blank/null.
      * @param includeAdult true or false to include adult titles in the search
-     * @param page The page of results to return. 0 to get the default (first page)
+     * @param page The page of results to return. 0 to get the default (first
+     * page)
      * @return
      * @throws MovieDbException
      */
     public TmdbResultsList<MovieDb> searchMovie(String movieName, int searchYear, String language, boolean includeAdult, int page) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_SEARCH, "movie");
-        if (StringUtils.isNotBlank(movieName)) {
-            apiUrl.addArgument(PARAM_QUERY, movieName);
-        }
-
-        if (searchYear > 0) {
-            apiUrl.addArgument(PARAM_YEAR, Integer.toString(searchYear));
-        }
-
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        apiUrl.addArgument(PARAM_ADULT, Boolean.toString(includeAdult));
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, Integer.toString(page));
-        }
-
-        URL url = apiUrl.buildUrl();
-
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.QUERY, movieName);
+        parameters.add(Param.YEAR, searchYear);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.ADULT, Boolean.toString(includeAdult));
+        parameters.add(Param.PAGE, Integer.toString(page));
+
+        URL url = new ApiUrl(apiKey, BASE_SEARCH).setSubMethod("movie").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
+
         try {
             WrapperMovie wrapper = mapper.readValue(webpage, WrapperMovie.class);
             TmdbResultsList<MovieDb> results = new TmdbResultsList<MovieDb>(wrapper.getMovies());
@@ -1637,23 +1546,14 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<Collection> searchCollection(String query, String language, int page) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_SEARCH, "collection");
-
-        if (StringUtils.isNotBlank(query)) {
-            apiUrl.addArgument(PARAM_QUERY, query);
-        }
-
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, Integer.toString(page));
-        }
-
-        URL url = apiUrl.buildUrl();
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.QUERY, query);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, Integer.toString(page));
 
+        URL url = new ApiUrl(apiKey, BASE_SEARCH).setSubMethod("collection").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
+
         try {
             WrapperCollection wrapper = mapper.readValue(webpage, WrapperCollection.class);
             TmdbResultsList<Collection> results = new TmdbResultsList<Collection>(wrapper.getResults());
@@ -1668,7 +1568,8 @@ public class TheMovieDbApi {
     /**
      * This is a good starting point to start finding people on TMDb.
      *
-     * The idea is to be a quick and light method so you can iterate through people quickly.
+     * The idea is to be a quick and light method so you can iterate through
+     * people quickly.
      *
      * @param personName
      * @param includeAdult
@@ -1677,15 +1578,12 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<Person> searchPeople(String personName, boolean includeAdult, int page) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_SEARCH, "person");
-        apiUrl.addArgument(PARAM_QUERY, personName);
-        apiUrl.addArgument(PARAM_ADULT, includeAdult);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.QUERY, personName);
+        parameters.add(Param.ADULT, includeAdult);
+        parameters.add(Param.PAGE, page);
 
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, page);
-        }
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_SEARCH).setSubMethod("person").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1709,23 +1607,14 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<MovieList> searchList(String query, String language, int page) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_SEARCH, "list");
-
-        if (StringUtils.isNotBlank(query)) {
-            apiUrl.addArgument(PARAM_QUERY, query);
-        }
-
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, Integer.toString(page));
-        }
-
-        URL url = apiUrl.buildUrl();
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.QUERY, query);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, Integer.toString(page));
 
+        URL url = new ApiUrl(apiKey, BASE_SEARCH).setSubMethod("list").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
+
         try {
             WrapperMovieList wrapper = mapper.readValue(webpage, WrapperMovieList.class);
             TmdbResultsList<MovieList> results = new TmdbResultsList<MovieList>(wrapper.getMovieList());
@@ -1740,8 +1629,8 @@ public class TheMovieDbApi {
     /**
      * Search Companies.
      *
-     * You can use this method to search for production companies that are part of TMDb. The company IDs will map to those returned
-     * on movie calls.
+     * You can use this method to search for production companies that are part
+     * of TMDb. The company IDs will map to those returned on movie calls.
      *
      * http://help.themoviedb.org/kb/api/search-companies
      *
@@ -1751,15 +1640,13 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<Company> searchCompanies(String companyName, int page) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_SEARCH, "company");
-        apiUrl.addArgument(PARAM_QUERY, companyName);
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, page);
-        }
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.QUERY, companyName);
+        parameters.add(Param.PAGE, page);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_SEARCH).setSubMethod("company").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
+
         try {
             WrapperCompany wrapper = mapper.readValue(webpage, WrapperCompany.class);
             TmdbResultsList<Company> results = new TmdbResultsList<Company>(wrapper.getResults());
@@ -1780,19 +1667,13 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<Keyword> searchKeyword(String query, int page) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_SEARCH, "keyword");
-
-        if (StringUtils.isNotBlank(query)) {
-            apiUrl.addArgument(PARAM_QUERY, query);
-        }
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, Integer.toString(page));
-        }
-
-        URL url = apiUrl.buildUrl();
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.QUERY, query);
+        parameters.add(Param.PAGE, Integer.toString(page));
 
+        URL url = new ApiUrl(apiKey, BASE_SEARCH).setSubMethod("keyword").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
+
         try {
             WrapperKeywords wrapper = mapper.readValue(webpage, WrapperKeywords.class);
             TmdbResultsList<Keyword> results = new TmdbResultsList<Keyword>(wrapper.getResults());
@@ -1814,10 +1695,10 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public MovieDbList getList(String listId) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_LIST);
-        apiUrl.addArgument(PARAM_ID, listId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, listId);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_LIST).buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1837,10 +1718,10 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public List<MovieDbList> getUserLists(String sessionId, int accountID) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_ACCOUNT, accountID + "/lists");
-        apiUrl.addArgument(PARAM_SESSION, sessionId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION, sessionId);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_ACCOUNT).setSubMethod(accountID, "/lists").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1861,16 +1742,15 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public String createList(String sessionId, String name, String description) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, "list");
-        apiUrl.addArgument(PARAM_SESSION, sessionId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION, sessionId);
 
         Map<String, String> body = new HashMap<String, String>();
         body.put("name", StringUtils.trimToEmpty(name));
         body.put("description", StringUtils.trimToEmpty(description));
-
         String jsonBody = convertToJson(body);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, "list").buildUrl(parameters);
         String webpage = httpTools.postRequest(url, jsonBody);
 
         try {
@@ -1890,10 +1770,10 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public boolean isMovieOnList(String listId, Integer movieId) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_LIST, listId + "/item_status");
-        apiUrl.addArgument(MOVIE_ID, movieId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, movieId);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_LIST).setSubMethod(listId, "/item_status").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1905,7 +1785,8 @@ public class TheMovieDbApi {
     }
 
     /**
-     * This method lets users add new movies to a list that they created. A valid session id is required.
+     * This method lets users add new movies to a list that they created. A
+     * valid session id is required.
      *
      * @param sessionId
      * @param listId
@@ -1918,7 +1799,8 @@ public class TheMovieDbApi {
     }
 
     /**
-     * This method lets users remove movies from a list that they created. A valid session id is required.
+     * This method lets users remove movies from a list that they created. A
+     * valid session id is required.
      *
      * @param sessionId
      * @param listId
@@ -1931,13 +1813,12 @@ public class TheMovieDbApi {
     }
 
     private StatusCode modifyMovieList(String sessionId, String listId, Integer movieId, String operation) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_LIST, listId + operation);
-
-        apiUrl.addArgument(PARAM_SESSION, sessionId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION, sessionId);
 
         String jsonBody = convertToJson(Collections.singletonMap("media_id", movieId + ""));
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_LIST).setSubMethod(listId, operation).buildUrl(parameters);
         String webpage = httpTools.postRequest(url, jsonBody);
 
         try {
@@ -1957,10 +1838,10 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public List<MovieDb> getWatchList(String sessionId, int accountId) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_ACCOUNT, accountId + "/movie_watchlist");
-        apiUrl.addArgument(PARAM_SESSION, sessionId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION, sessionId);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_ACCOUNT).setSubMethod(accountId, "/movie_watchlist").buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -1972,7 +1853,8 @@ public class TheMovieDbApi {
     }
 
     /**
-     * This method lets users delete a list that they created. A valid session id is required.
+     * This method lets users delete a list that they created. A valid session
+     * id is required.
      *
      * @param sessionId
      * @param listId
@@ -1980,11 +1862,10 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public StatusCode deleteMovieList(String sessionId, String listId) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_LIST, listId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.SESSION, sessionId);
 
-        apiUrl.addArgument(PARAM_SESSION, sessionId);
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_LIST).setSubMethod(listId).buildUrl(parameters);
         String webpage = httpTools.deleteRequest(url);
 
         try {
@@ -2005,10 +1886,10 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public Keyword getKeyword(String keywordId) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_KEYWORD);
-        apiUrl.addArgument(PARAM_ID, keywordId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, keywordId);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_KEYWORD).buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -2030,18 +1911,12 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<KeywordMovie> getKeywordMovies(String keywordId, String language, int page) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_KEYWORD, URL_MOVIES);
-        apiUrl.addArgument(PARAM_ID, keywordId);
+        TmdbParameters parameters = new TmdbParameters();
+        parameters.add(Param.ID, keywordId);
+        parameters.add(Param.LANGUAGE, language);
+        parameters.add(Param.PAGE, page);
 
-        if (StringUtils.isNotBlank(language)) {
-            apiUrl.addArgument(PARAM_LANGUAGE, language);
-        }
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, page);
-        }
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_KEYWORD).setSubMethod(URL_MOVIES).buildUrl(parameters);
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -2059,10 +1934,12 @@ public class TheMovieDbApi {
 
     //<editor-fold defaultstate="collapsed" desc="Changes Functions">
     /**
-     * Get a list of movie ids that have been edited. By default we show the last 24 hours and only 100 items per page. The maximum
-     * number of days that can be returned in a single request is 14. You can then use the movie changes API to get the actual data
-     * that has been changed. Please note that the change log system to support this was changed on October 5, 2012 and will only
-     * show movies that have been edited since.
+     * Get a list of movie ids that have been edited. By default we show the
+     * last 24 hours and only 100 items per page. The maximum number of days
+     * that can be returned in a single request is 14. You can then use the
+     * movie changes API to get the actual data that has been changed. Please
+     * note that the change log system to support this was changed on October 5,
+     * 2012 and will only show movies that have been edited since.
      *
      * @param page
      * @param startDate the start date of the changes, optional
@@ -2071,22 +1948,14 @@ public class TheMovieDbApi {
      * @throws MovieDbException
      */
     public TmdbResultsList<ChangedMovie> getMovieChangesList(int page, String startDate, String endDate) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "/changes");
-
-        if (page > 0) {
-            apiUrl.addArgument(PARAM_PAGE, page);
-        }
-
-        if (StringUtils.isNotBlank(startDate)) {
-            apiUrl.addArgument(PARAM_START_DATE, startDate);
-        }
-
-        if (StringUtils.isNotBlank(endDate)) {
-            apiUrl.addArgument(PARAM_END_DATE, endDate);
-        }
+        TmdbParameters params = new TmdbParameters();
+        params.add(Param.PAGE, page);
+        params.add(Param.START_DATE, startDate);
+        params.add(Param.END_DATE, endDate);
 
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_MOVIE).setSubMethod("/changes").buildUrl(params);
         String webpage = httpTools.getRequest(url);
+
         try {
             WrapperMovieChanges wrapper = mapper.readValue(webpage, WrapperMovieChanges.class);
 
@@ -2107,9 +1976,7 @@ public class TheMovieDbApi {
 
     //<editor-fold defaultstate="collapsed" desc="Jobs">
     public TmdbResultsList<JobDepartment> getJobs() throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_JOB, "/list");
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_JOB).setSubMethod("list").buildUrl();
         String webpage = httpTools.getRequest(url);
 
         try {
@@ -2126,30 +1993,42 @@ public class TheMovieDbApi {
 
     //<editor-fold defaultstate="collapsed" desc="Discover">
     /**
-     * Discover movies by different types of data like average rating, number of votes, genres and certifications.
+     * Discover movies by different types of data like average rating, number of
+     * votes, genres and certifications.
      *
-     * You can alternatively create a "discover" object and pass it to this method to cut out the requirement for all of these
-     * parameters
+     * You can alternatively create a "discover" object and pass it to this
+     * method to cut out the requirement for all of these parameters
      *
      * @param page Minimum value is 1
      * @param language ISO 639-1 code.
-     * @param sortBy Available options are vote_average.desc, vote_average.asc, release_date.desc, release_date.asc,
-     * popularity.desc, popularity.asc
+     * @param sortBy Available options are vote_average.desc, vote_average.asc,
+     * release_date.desc, release_date.asc, popularity.desc, popularity.asc
      * @param includeAdult Toggle the inclusion of adult titles
-     * @param year Filter the results release dates to matches that include this value
-     * @param primaryReleaseYear Filter the results so that only the primary release date year has this value
-     * @param voteCountGte Only include movies that are equal to, or have a vote count higher than this value
-     * @param voteAverageGte Only include movies that are equal to, or have a higher average rating than this value
-     * @param withGenres Only include movies with the specified genres. Expected value is an integer (the id of a genre). Multiple
-     * values can be specified. Comma separated indicates an 'AND' query, while a pipe (|) separated value indicates an 'OR'.
-     * @param releaseDateGte The minimum release to include. Expected format is YYYY-MM-DD
-     * @param releaseDateLte The maximum release to include. Expected format is YYYY-MM-DD
-     * @param certificationCountry Only include movies with certifications for a specific country. When this value is specified,
-     * 'certificationLte' is required. A ISO 3166-1 is expected.
-     * @param certificationLte Only include movies with this certification and lower. Expected value is a valid certification for
-     * the specified 'certificationCountry'.
-     * @param withCompanies Filter movies to include a specific company. Expected value is an integer (the id of a company). They
-     * can be comma separated to indicate an 'AND' query.
+     * @param year Filter the results release dates to matches that include this
+     * value
+     * @param primaryReleaseYear Filter the results so that only the primary
+     * release date year has this value
+     * @param voteCountGte Only include movies that are equal to, or have a vote
+     * count higher than this value
+     * @param voteAverageGte Only include movies that are equal to, or have a
+     * higher average rating than this value
+     * @param withGenres Only include movies with the specified genres. Expected
+     * value is an integer (the id of a genre). Multiple values can be
+     * specified. Comma separated indicates an 'AND' query, while a pipe (|)
+     * separated value indicates an 'OR'.
+     * @param releaseDateGte The minimum release to include. Expected format is
+     * YYYY-MM-DD
+     * @param releaseDateLte The maximum release to include. Expected format is
+     * YYYY-MM-DD
+     * @param certificationCountry Only include movies with certifications for a
+     * specific country. When this value is specified, 'certificationLte' is
+     * required. A ISO 3166-1 is expected.
+     * @param certificationLte Only include movies with this certification and
+     * lower. Expected value is a valid certification for the specified
+     * 'certificationCountry'.
+     * @param withCompanies Filter movies to include a specific company.
+     * Expected value is an integer (the id of a company). They can be comma
+     * separated to indicate an 'AND' query.
      * @return
      * @throws MovieDbException
      */
@@ -2177,18 +2056,15 @@ public class TheMovieDbApi {
     }
 
     /**
-     * Discover movies by different types of data like average rating, number of votes, genres and certifications.
+     * Discover movies by different types of data like average rating, number of
+     * votes, genres and certifications.
      *
      * @param discover A discover object containing the search criteria required
      * @return
      * @throws MovieDbException
      */
     public TmdbResultsList<MovieDb> getDiscover(Discover discover) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_DISCOVER, "/movie");
-
-        apiUrl.setArguments(discover.getParams());
-
-        URL url = apiUrl.buildUrl();
+        URL url = new ApiUrl(apiKey, BASE_DISCOVER).setSubMethod("movie").buildUrl(discover.getParams());
         String webpage = httpTools.getRequest(url);
 
         try {
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Discover.java b/src/main/java/com/omertron/themoviedbapi/model/Discover.java
index c1306e578..f2ae0d9ca 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Discover.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Discover.java
@@ -19,13 +19,8 @@
  */
 package com.omertron.themoviedbapi.model;
 
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_ADULT;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_LANGUAGE;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_PAGE;
-import static com.omertron.themoviedbapi.tools.ApiUrl.PARAM_YEAR;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
+import com.omertron.themoviedbapi.tools.Param;
+import com.omertron.themoviedbapi.tools.TmdbParameters;
 
 /**
  * Generate a discover object for use in the MovieDbApi
@@ -36,17 +31,8 @@ import org.apache.commons.lang3.StringUtils;
  */
 public class Discover {
 
-    private final Map<String, String> params = new HashMap<String, String>();
-    private static final String PARAM_PRIMARY_RELEASE_YEAR = "primary_release_year=";
-    private static final String PARAM_VOTE_COUNT_GTE = "vote_count.gte=";
-    private static final String PARAM_VOTE_AVERAGE_GTE = "vote_average.gte=";
-    private static final String PARAM_WITH_GENRES = "with_genres=";
-    private static final String PARAM_RELEASE_DATE_GTE = "release_date.gte=";
-    private static final String PARAM_RELEASE_DATE_LTE = "release_date.lte=";
-    private static final String PARAM_CERTIFICATION_COUNTRY = "certification_country=";
-    private static final String PARAM_CERTIFICATION_LTE = "certification.lte=";
-    private static final String PARAM_WITH_COMPANIES = "with_companies=";
-    private static final String PARAM_SORT_BY = "sort_by=";
+    private final TmdbParameters params = new TmdbParameters();
+
     private static final int YEAR_MIN = 1900;
     private static final int YEAR_MAX = 2100;
 
@@ -57,7 +43,7 @@ public class Discover {
      *
      * @return
      */
-    public Map<String, String> getParams() {
+    public TmdbParameters getParams() {
         return params;
     }
 
@@ -68,9 +54,7 @@ public class Discover {
      * @return
      */
     public Discover page(int page) {
-        if (page > 0) {
-            params.put(PARAM_PAGE, String.valueOf(page));
-        }
+        params.add(Param.PAGE, page);
         return this;
     }
 
@@ -81,9 +65,7 @@ public class Discover {
      * @return
      */
     public Discover language(String language) {
-        if (StringUtils.isNotBlank(language)) {
-            params.put(PARAM_LANGUAGE, language);
-        }
+        params.add(Param.LANGUAGE, language);
         return this;
     }
 
@@ -100,9 +82,7 @@ public class Discover {
      * @return
      */
     public Discover sortBy(String sortBy) {
-        if (StringUtils.isNotBlank(sortBy)) {
-            params.put(PARAM_SORT_BY, sortBy);
-        }
+        params.add(Param.SORT_BY, sortBy);
         return this;
     }
 
@@ -113,7 +93,7 @@ public class Discover {
      * @return
      */
     public Discover includeAdult(boolean includeAdult) {
-        params.put(PARAM_ADULT, String.valueOf(includeAdult));
+        params.add(Param.ADULT, includeAdult);
         return this;
     }
 
@@ -125,47 +105,46 @@ public class Discover {
      */
     public Discover year(int year) {
         if (checkYear(year)) {
-            params.put(PARAM_YEAR, String.valueOf(year));
+            params.add(Param.YEAR, year);
         }
         return this;
     }
 
     /**
-     * Filter the results so that only the primary release date year has this value
+     * Filter the results so that only the primary release date year has this
+     * value
      *
      * @param primaryReleaseYear
      * @return
      */
     public Discover primaryReleaseYear(int primaryReleaseYear) {
         if (checkYear(primaryReleaseYear)) {
-            params.put(PARAM_PRIMARY_RELEASE_YEAR, String.valueOf(primaryReleaseYear));
+            params.add(Param.PRIMARY_RELEASE_YEAR, primaryReleaseYear);
         }
         return this;
     }
 
     /**
-     * Only include movies that are equal to, or have a vote count higher than this value
+     * Only include movies that are equal to, or have a vote count higher than
+     * this value
      *
      * @param voteCountGte
      * @return
      */
     public Discover voteCountGte(int voteCountGte) {
-        if (voteCountGte > 0) {
-            params.put(PARAM_VOTE_COUNT_GTE, String.valueOf(voteCountGte));
-        }
+        params.add(Param.VOTE_COUNT_GTE, voteCountGte);
         return this;
     }
 
     /**
-     * Only include movies that are equal to, or have a higher average rating than this value
+     * Only include movies that are equal to, or have a higher average rating
+     * than this value
      *
      * @param voteAverageGte
      * @return
      */
     public Discover voteAverageGte(float voteAverageGte) {
-        if (voteAverageGte > 0) {
-            params.put(PARAM_VOTE_AVERAGE_GTE, String.valueOf(voteAverageGte));
-        }
+        params.add(Param.VOTE_AVERAGE_GTE, voteAverageGte);
         return this;
     }
 
@@ -176,15 +155,14 @@ public class Discover {
      * <p/>
      * Multiple values can be specified.
      * <p/>
-     * Comma separated indicates an 'AND' query, while a pipe (|) separated value indicates an 'OR'
+     * Comma separated indicates an 'AND' query, while a pipe (|) separated
+     * value indicates an 'OR'
      *
      * @param withGenres
      * @return
      */
     public Discover withGenres(String withGenres) {
-        if (StringUtils.isNotBlank(withGenres)) {
-            params.put(PARAM_WITH_GENRES, withGenres);
-        }
+        params.add(Param.WITH_GENRES, withGenres);
         return this;
     }
 
@@ -197,9 +175,7 @@ public class Discover {
      * @return
      */
     public Discover releaseDateGte(String releaseDateGte) {
-        if (StringUtils.isNotBlank(releaseDateGte)) {
-            params.put(PARAM_RELEASE_DATE_GTE, releaseDateGte);
-        }
+        params.add(Param.RELEASE_DATE_GTE, releaseDateGte);
         return this;
     }
 
@@ -212,9 +188,7 @@ public class Discover {
      * @return
      */
     public Discover releaseDateLte(String releaseDateLte) {
-        if (StringUtils.isNotBlank(releaseDateLte)) {
-            params.put(PARAM_RELEASE_DATE_LTE, releaseDateLte);
-        }
+        params.add(Param.RELEASE_DATE_LTE, releaseDateLte);
         return this;
     }
 
@@ -229,24 +203,21 @@ public class Discover {
      * @return
      */
     public Discover certificationCountry(String certificationCountry) {
-        if (StringUtils.isNotBlank(certificationCountry)) {
-            params.put(PARAM_CERTIFICATION_COUNTRY, certificationCountry);
-        }
+        params.add(Param.CERTIFICATION_COUNTRY, certificationCountry);
         return this;
     }
 
     /**
      * Only include movies with this certification and lower.
      * <p/>
-     * Expected value is a valid certification for the specified 'certificationCountry'.
+     * Expected value is a valid certification for the specified
+     * 'certificationCountry'.
      *
      * @param certificationLte
      * @return
      */
     public Discover certificationLte(String certificationLte) {
-        if (StringUtils.isNotBlank(certificationLte)) {
-            params.put(PARAM_CERTIFICATION_LTE, certificationLte);
-        }
+        params.add(Param.CERTIFICATION_LTE, certificationLte);
         return this;
     }
 
@@ -261,9 +232,7 @@ public class Discover {
      * @return
      */
     public Discover withCompanies(String withCompanies) {
-        if (StringUtils.isNotBlank(withCompanies)) {
-            params.put(PARAM_WITH_COMPANIES, withCompanies);
-        }
+        params.add(Param.WITH_COMPANIES, withCompanies);
         return this;
     }
 
diff --git a/src/main/java/com/omertron/themoviedbapi/tools/ApiUrl.java b/src/main/java/com/omertron/themoviedbapi/tools/ApiUrl.java
index 322e757db..8bff9328e 100644
--- a/src/main/java/com/omertron/themoviedbapi/tools/ApiUrl.java
+++ b/src/main/java/com/omertron/themoviedbapi/tools/ApiUrl.java
@@ -36,51 +36,19 @@ import org.slf4j.LoggerFactory;
  */
 public class ApiUrl {
 
-    /*
-     * Logger
-     */
     private static final Logger LOG = LoggerFactory.getLogger(ApiUrl.class);
-    /*
-     * TheMovieDbApi API Base URL
-     */
+    // TheMovieDbApi API Base URL
     private static final String TMDB_API_BASE = "http://api.themoviedb.org/3/";
-    /*
-     * Parameter configuration
-     */
+    // Parameter configuration
     private static final String DELIMITER_FIRST = "?";
     private static final String DELIMITER_SUBSEQUENT = "&";
     private static final String DEFAULT_STRING = "";
-    /*
-     * Properties
-     */
+    // Properties
     private final String apiKey;
     private final String method;
-    private final String submethod;
+    private String submethod;
     private final Map<String, String> arguments = new HashMap<String, String>();
-    /*
-     * API Parameters
-     */
-    public static final String PARAM_ADULT = "include_adult=";
-    public static final String PARAM_API_KEY = "api_key=";
-    public static final String PARAM_COUNTRY = "country=";
-    public static final String PARAM_FAVORITE = "favorite=";
-    public static final String PARAM_ID = "id=";
-    public static final String PARAM_LANGUAGE = "language=";
-    public static final String PARAM_INCLUDE_ALL_MOVIES = "include_all_movies=";
-    public static final String PARAM_MOVIE_WATCHLIST = "movie_watchlist=";
-    public static final String PARAM_PAGE = "page=";
-    public static final String PARAM_QUERY = "query=";
-    public static final String PARAM_SESSION = "session_id=";
-    public static final String PARAM_TOKEN = "request_token=";
-    public static final String PARAM_VALUE = "value=";
-    public static final String PARAM_YEAR = "year=";
-    public static final String PARAM_START_DATE = "start_date=";
-    public static final String PARAM_END_DATE = "end_date=";
-    public static final String PARAM_USERNAME = "username=";
-    public static final String PARAM_PASSWORD = "password=";
-    private static final String APPEND_TO_RESPONSE = "append_to_response=";
 
-    //<editor-fold defaultstate="collapsed" desc="Constructor Methods">
     /**
      * Constructor for the simple API URL method without a sub-method
      *
@@ -90,36 +58,66 @@ public class ApiUrl {
     public ApiUrl(String apiKey, String method) {
         this.apiKey = apiKey;
         this.method = method;
-        this.submethod = DEFAULT_STRING;
     }
 
     /**
-     * Constructor for the API URL with a sub-method
+     * Add a sub-methods
      *
-     * @param apiKey
-     * @param method
      * @param submethod
+     * @return
      */
-    public ApiUrl(String apiKey, String method, String submethod) {
-        this.apiKey = apiKey;
-        this.method = method;
+    public ApiUrl setSubMethod(String submethod) {
         this.submethod = submethod;
+        return this;
     }
-    //</editor-fold>
 
     /**
-     * Build the URL from the pre-created arguments.
+     * Add a sub-method that has an ID at the start
+     *
+     * @param someId
+     * @param submethod
+     * @return
+     */
+    public ApiUrl setSubMethod(int someId, String submethod) {
+        this.submethod = someId + submethod;
+        return this;
+    }
+
+    /**
+     * Add a sub-method that has an ID at the start
+     *
+     * @param someId
+     * @param submethod
+     * @return
+     */
+    public ApiUrl setSubMethod(String someId, String submethod) {
+        this.submethod = someId + submethod;
+        return this;
+    }
+
+    /**
+     * Build the URL with the default parameters
      *
      * @return
      */
     public URL buildUrl() {
+        return buildUrl(new TmdbParameters());
+    }
+
+    /**
+     * Build the URL from the pre-created parameters.
+     *
+     * @param params
+     * @return
+     */
+    public URL buildUrl(TmdbParameters params) {
         StringBuilder urlString = new StringBuilder(TMDB_API_BASE);
 
         // Get the start of the URL
         urlString.append(method);
 
         // We have either a queury, or a direct request
-        if (arguments.containsKey(PARAM_QUERY)) {
+        if (params.has(Param.QUERY)) {
             // Append the suffix of the API URL
             if (StringUtils.endsWith(urlString, "/") && submethod.startsWith("/")) {
                 urlString.deleteCharAt(urlString.length() - 1);
@@ -127,14 +125,14 @@ public class ApiUrl {
             urlString.append(submethod);
 
             // Append the key information
-            urlString.append(DELIMITER_FIRST).append(PARAM_API_KEY);
+            urlString.append(DELIMITER_FIRST).append(Param.API_KEY.getValue());
             urlString.append(apiKey);
 
             // Append the search term
             urlString.append(DELIMITER_SUBSEQUENT);
-            urlString.append(PARAM_QUERY);
+            urlString.append(Param.QUERY.getValue());
 
-            String query = arguments.get(PARAM_QUERY);
+            String query = (String) params.get(Param.QUERY);
 
             try {
                 urlString.append(URLEncoder.encode(query, "UTF-8"));
@@ -145,12 +143,12 @@ public class ApiUrl {
             }
 
             // Remove the query from the arguments so it is not added later
-            arguments.remove(PARAM_QUERY);
+            params.remove(Param.QUERY);
         } else {
             // Append the ID if provided
-            if (arguments.containsKey(PARAM_ID)) {
-                urlString.append(arguments.get(PARAM_ID));
-                arguments.remove(PARAM_ID);
+            if (params.has(Param.ID)) {
+                urlString.append(params.get(Param.ID));
+                params.remove(Param.ID);
             }
 
             // Append the suffix of the API URL
@@ -160,7 +158,7 @@ public class ApiUrl {
             urlString.append(submethod);
 
             // Append the key information
-            urlString.append(DELIMITER_FIRST).append(PARAM_API_KEY);
+            urlString.append(DELIMITER_FIRST).append(Param.API_KEY);
             urlString.append(apiKey);
         }
 
@@ -179,81 +177,4 @@ public class ApiUrl {
             arguments.clear();
         }
     }
-
-    /**
-     * Add arguments individually
-     *
-     * @param key
-     * @param value
-     */
-    public void addArgument(String key, String value) {
-        arguments.put(key, value);
-    }
-
-    /**
-     * Add arguments individually
-     *
-     * @param key
-     * @param value
-     */
-    public void addArgument(String key, int value) {
-        arguments.put(key, Integer.toString(value));
-    }
-
-    /**
-     * Add arguments individually
-     *
-     * @param key
-     * @param value
-     */
-    public void addArgument(String key, boolean value) {
-        arguments.put(key, Boolean.toString(value));
-    }
-
-    /**
-     * Add arguments individually
-     *
-     * @param key
-     * @param value
-     */
-    public void addArgument(String key, float value) {
-        arguments.put(key, Float.toString(value));
-    }
-
-    /**
-     * Clear the arguments
-     */
-    public void clearArguments() {
-        arguments.clear();
-    }
-
-    /**
-     * Set the arguments directly
-     *
-     * @param args
-     */
-    public void setArguments(Map<String, String> args) {
-        arguments.putAll(args);
-    }
-
-    /**
-     * Append any optional parameters to the URL
-     *
-     * @param appendToResponse
-     */
-    public void appendToResponse(String[] appendToResponse) {
-        if (appendToResponse.length > 0) {
-            StringBuilder sb = new StringBuilder();
-            boolean first = Boolean.TRUE;
-            for (String append : appendToResponse) {
-                if (first) {
-                    first = Boolean.FALSE;
-                } else {
-                    sb.append(",");
-                }
-                sb.append(append);
-            }
-            addArgument(APPEND_TO_RESPONSE, sb.toString());
-        }
-    }
 }
diff --git a/src/main/java/com/omertron/themoviedbapi/tools/Param.java b/src/main/java/com/omertron/themoviedbapi/tools/Param.java
new file mode 100644
index 000000000..fb46d3e69
--- /dev/null
+++ b/src/main/java/com/omertron/themoviedbapi/tools/Param.java
@@ -0,0 +1,99 @@
+/*
+ *      Copyright (c) 2004-2015 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation, either version 3 of the License, or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi.tools;
+
+import java.util.EnumSet;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Parameters for use in the URL
+ *
+ * @author Stuart
+ */
+public enum Param {
+
+    ADULT("include_adult="),
+    API_KEY("api_key="),
+    APPEND("append_to_response="),
+    COUNTRY("country="),
+    END_DATE("end_date="),
+    FAVORITE("favorite="),
+    ID("id="),
+    INCLUDE_ALL_MOVIES("include_all_movies="),
+    LANGUAGE("language="),
+    MOVIE_WATCHLIST("movie_watchlist="),
+    PAGE("page="),
+    PASSWORD("password="),
+    QUERY("query="),
+    SESSION("session_id="),
+    START_DATE("start_date="),
+    TOKEN("request_token="),
+    USERNAME("username="),
+    VALUE("value="),
+    YEAR("year="),
+    /*
+     * Discover parameters
+     */
+    CERTIFICATION_COUNTRY("certification_country="),
+    CERTIFICATION_LTE("certification.lte="),
+    PRIMARY_RELEASE_YEAR("primary_release_year="),
+    RELEASE_DATE_GTE("release_date.gte="),
+    RELEASE_DATE_LTE("release_date.lte="),
+    SORT_BY("sort_by="),
+    VOTE_AVERAGE_GTE("vote_average.gte="),
+    VOTE_COUNT_GTE("vote_count.gte="),
+    WITH_COMPANIES("with_companies="),
+    WITH_GENRES("with_genres=");
+
+    private final String value;
+
+    private Param(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Get the URL parameter to use
+     *
+     * @return
+     */
+    public String getValue() {
+        return this.value;
+    }
+
+    /**
+     * Convert a string into an Enum type
+     *
+     * @param value
+     * @return
+     */
+    public static Param fromString(String value) {
+        if (StringUtils.isNotBlank(value)) {
+            for (final Param param : EnumSet.allOf(Param.class)) {
+                if (value.equalsIgnoreCase(param.value)) {
+                    return param;
+                }
+            }
+        }
+
+        // We've not found the type!
+        throw new IllegalArgumentException("Value '" + value + "' not recognised");
+    }
+
+}
diff --git a/src/main/java/com/omertron/themoviedbapi/tools/TmdbParameters.java b/src/main/java/com/omertron/themoviedbapi/tools/TmdbParameters.java
new file mode 100644
index 000000000..eea019e2a
--- /dev/null
+++ b/src/main/java/com/omertron/themoviedbapi/tools/TmdbParameters.java
@@ -0,0 +1,173 @@
+/*
+ *      Copyright (c) 2004-2015 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation, either version 3 of the License, or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi.tools;
+
+import java.util.EnumMap;
+import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * Parameters for the TMDB API
+ *
+ * @author Stuart
+ */
+public class TmdbParameters {
+
+    private final Map<Param, String> parameters = new EnumMap<Param, String>(Param.class);
+
+    /**
+     * Construct an empty set of parameters
+     */
+    public TmdbParameters() {
+    }
+
+    /**
+     * Add a parameter to the collection
+     *
+     * @param key Parameter to add
+     * @param value The array value to use (will be converted into a comma
+     * separated list)
+     */
+    public void add(Param key, String[] value) {
+        parameters.put(key, toList(value));
+    }
+
+    /**
+     * Add a string parameter to the collection
+     *
+     * @param key Parameter to add
+     * @param value The value to add (will be checked to ensure it's valid)
+     */
+    public void add(Param key, String value) {
+        if (StringUtils.isNotBlank(value)) {
+            parameters.put(key, value);
+        }
+    }
+
+    /**
+     * Add an integer parameter to the collection
+     *
+     * @param key Parameter to add
+     * @param value The value to add (will be checked to ensure >0)
+     */
+    public void add(Param key, int value) {
+        if (value > 0) {
+            parameters.put(key, String.valueOf(value));
+        }
+    }
+
+    /**
+     * Add a float parameter to the collection
+     *
+     * @param key Parameter to add
+     * @param value The value to add (will be checked to ensure >0)
+     */
+    public void add(Param key, float value) {
+        if (value > 0) {
+            parameters.put(key, String.valueOf(value));
+        }
+    }
+
+    /**
+     * Add a boolean parameter to the collection
+     *
+     * @param key Parameter to add
+     * @param value The value to add (will be checked to ensure >0)
+     */
+    public void add(Param key, boolean value) {
+        parameters.put(key, String.valueOf(value));
+    }
+
+    /**
+     * Check to see if the collection has a certain parameter
+     *
+     * @param key The Parameter to check
+     * @return
+     */
+    public boolean has(Param key) {
+        return parameters.containsKey(key);
+    }
+
+    /**
+     * Get a parameter from the collection
+     *
+     * @param key The parameter to get
+     * @return
+     */
+    public Object get(Param key) {
+        return parameters.get(key);
+    }
+
+    /**
+     * Remove a parameter from the collection
+     *
+     * @param key
+     */
+    public void remove(Param key) {
+        parameters.remove(key);
+    }
+
+    /**
+     * Check to see if the collection has no items
+     *
+     * @return
+     */
+    public boolean isEmpty() {
+        return parameters.isEmpty();
+    }
+
+    /**
+     * Check to see if the collection has items
+     *
+     * @return
+     */
+    public boolean isNotEmpty() {
+        return !isEmpty();
+    }
+
+    /**
+     * Append any optional parameters to the URL
+     *
+     * @param appendToResponse
+     * @return
+     */
+    public String toList(String[] appendToResponse) {
+        StringBuilder sb = new StringBuilder();
+        if (appendToResponse.length > 0) {
+            boolean first = Boolean.TRUE;
+            for (String append : appendToResponse) {
+                if (first) {
+                    first = Boolean.FALSE;
+                } else {
+                    sb.append(",");
+                }
+                sb.append(append);
+            }
+        }
+        return sb.toString();
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(parameters, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+}