diff --git a/src/main/java/com/omertron/themoviedbapi/model/Artwork.java b/src/main/java/com/omertron/themoviedbapi/model/Artwork.java
index 56caaa4ef..fc62646e2 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Artwork.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Artwork.java
@@ -30,9 +30,6 @@ public class Artwork extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Properties
-     */
     @JsonProperty("aspect_ratio")
     private float aspectRatio;
     @JsonProperty("file_path")
@@ -51,7 +48,6 @@ public class Artwork extends AbstractJsonMapping {
     private String flag;
     private ArtworkType artworkType = ArtworkType.POSTER;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public ArtworkType getArtworkType() {
         return artworkType;
     }
@@ -87,9 +83,7 @@ public class Artwork extends AbstractJsonMapping {
     public String getFlag() {
         return flag;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setArtworkType(ArtworkType artworkType) {
         this.artworkType = artworkType;
     }
@@ -125,7 +119,6 @@ public class Artwork extends AbstractJsonMapping {
     public void setFlag(String flag) {
         this.flag = flag;
     }
-    // </editor-fold>
 
     @Override
     public boolean equals(Object obj) {
diff --git a/src/main/java/com/omertron/themoviedbapi/model/ChangedMovie.java b/src/main/java/com/omertron/themoviedbapi/model/ChangedMovie.java
index 338fc5e34..7f029e55a 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/ChangedMovie.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/ChangedMovie.java
@@ -25,15 +25,11 @@ public class ChangedMovie extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Properties
-     */
     @JsonProperty("id")
     private String id;
     @JsonProperty("adult")
     private boolean adult;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getId() {
         return id;
     }
@@ -41,9 +37,7 @@ public class ChangedMovie extends AbstractJsonMapping {
     public boolean isAdult() {
         return adult;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setId(String id) {
         this.id = id;
     }
@@ -51,5 +45,4 @@ public class ChangedMovie extends AbstractJsonMapping {
     public void setAdult(boolean adult) {
         this.adult = adult;
     }
-    // </editor-fold>
 }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Collection.java b/src/main/java/com/omertron/themoviedbapi/model/Collection.java
index 91a97389c..cf73d9443 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Collection.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Collection.java
@@ -47,7 +47,6 @@ public class Collection extends AbstractJsonMapping {
     @JsonProperty("release_date")
     private String releaseDate;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getBackdropPath() {
         return backdropPath;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java b/src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java
index 9d4f296b4..273fe0aea 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java
@@ -47,7 +47,6 @@ public class CollectionInfo extends AbstractJsonMapping {
     @JsonProperty("parts")
     private List<Collection> parts = new ArrayList<Collection>();
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getBackdropPath() {
         return backdropPath;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Company.java b/src/main/java/com/omertron/themoviedbapi/model/Company.java
index 01eda6db2..088f741b2 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Company.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Company.java
@@ -46,7 +46,6 @@ public class Company extends AbstractJsonMapping {
     @JsonProperty("parent_company")
     private Company parentCompany = null;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
     public int getCompanyId() {
         return companyId;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Genre.java b/src/main/java/com/omertron/themoviedbapi/model/Genre.java
index 4c21ebb63..7eb844771 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Genre.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Genre.java
@@ -37,7 +37,6 @@ public class Genre extends AbstractJsonMapping {
     @JsonProperty("name")
     private String name;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public int getId() {
         return id;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/JobDepartment.java b/src/main/java/com/omertron/themoviedbapi/model/JobDepartment.java
index 1292d4c05..97c078b69 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/JobDepartment.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/JobDepartment.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
 
-public class JobDepartment {
+public class JobDepartment extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
     // Properties
@@ -32,7 +32,6 @@ public class JobDepartment {
     @JsonProperty("job_list")
     private List<String> jobs;
 
-    //<editor-fold defaultstate="collapsed" desc="Getters">
     public String getDepartment() {
         return department;
     }
@@ -41,7 +40,6 @@ public class JobDepartment {
         return jobs;
     }
 
-    //<editor-fold defaultstate="collapsed" desc="Setters">
     public void setDepartment(String department) {
         this.department = department;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Keyword.java b/src/main/java/com/omertron/themoviedbapi/model/Keyword.java
index 34711cbea..0c3c4e3bb 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Keyword.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Keyword.java
@@ -38,7 +38,6 @@ public class Keyword extends AbstractJsonMapping {
     @JsonProperty("name")
     private String name;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public int getId() {
         return id;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/KeywordMovie.java b/src/main/java/com/omertron/themoviedbapi/model/KeywordMovie.java
index 3730d2d5d..f4ffc3595 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/KeywordMovie.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/KeywordMovie.java
@@ -52,7 +52,6 @@ public class KeywordMovie extends AbstractJsonMapping {
     @JsonProperty("popularity")
     private float popularity;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -96,9 +95,7 @@ public class KeywordMovie extends AbstractJsonMapping {
     public float getPopularity() {
         return popularity;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setBackdropPath(String backdropPath) {
         this.backdropPath = backdropPath;
     }
@@ -138,5 +135,4 @@ public class KeywordMovie extends AbstractJsonMapping {
     public void setPopularity(float popularity) {
         this.popularity = popularity;
     }
-    // </editor-fold>
 }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Language.java b/src/main/java/com/omertron/themoviedbapi/model/Language.java
index 326e2b559..728944ca8 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Language.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Language.java
@@ -37,7 +37,6 @@ public class Language extends AbstractJsonMapping {
     @JsonProperty("name")
     private String name;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getIsoCode() {
         return isoCode;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java b/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java
index c41ee6fbb..4e2f52754 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java
@@ -31,9 +31,6 @@ import java.util.List;
  */
 public class MovieDbList extends AbstractJsonMapping {
 
-    /*
-     * Properties
-     */
     @JsonProperty("id")
     private String id;
     @JsonProperty("created_by")
@@ -57,7 +54,6 @@ public class MovieDbList extends AbstractJsonMapping {
     @JsonProperty("status_message")
     private String statusMessage;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
     public String getId() {
         return id;
     }
@@ -101,9 +97,7 @@ public class MovieDbList extends AbstractJsonMapping {
     public String getStatusMessage() {
         return statusMessage;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter Methods">
     public void setId(String id) {
         this.id = id;
     }
@@ -147,5 +141,4 @@ public class MovieDbList extends AbstractJsonMapping {
     public void setStatusMessage(String statusMessage) {
         this.statusMessage = statusMessage;
     }
-    //</editor-fold>
 }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/MovieList.java b/src/main/java/com/omertron/themoviedbapi/model/MovieList.java
index b882810cb..af494652e 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/MovieList.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/MovieList.java
@@ -28,9 +28,6 @@ public class MovieList extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Properties
-     */
     @JsonProperty("description")
     private String description;
     @JsonProperty("favorite_count")
@@ -48,7 +45,6 @@ public class MovieList extends AbstractJsonMapping {
     @JsonProperty("list_type")
     private String listType;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getDescription() {
         return description;
     }
@@ -80,9 +76,7 @@ public class MovieList extends AbstractJsonMapping {
     public String getListType() {
         return listType;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setDescription(String description) {
         this.description = description;
     }
@@ -114,5 +108,4 @@ public class MovieList extends AbstractJsonMapping {
     public void setListType(String listType) {
         this.listType = listType;
     }
-    // </editor-fold>
 }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Person.java b/src/main/java/com/omertron/themoviedbapi/model/Person.java
index 527a6df8b..f3b941d5f 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Person.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Person.java
@@ -111,7 +111,6 @@ public class Person extends AbstractJsonMapping {
         setJob(CAST_JOB);
     }
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getCharacter() {
         return character;
     }
@@ -179,9 +178,7 @@ public class Person extends AbstractJsonMapping {
     public float getPopularity() {
         return popularity;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setCharacter(String character) {
         this.character = character;
     }
@@ -249,7 +246,6 @@ public class Person extends AbstractJsonMapping {
     public void setPopularity(float popularity) {
         this.popularity = popularity;
     }
-    // </editor-fold>
 
     @Override
     public boolean equals(Object obj) {
diff --git a/src/main/java/com/omertron/themoviedbapi/model/PersonCast.java b/src/main/java/com/omertron/themoviedbapi/model/PersonCast.java
index 9431240fa..3dc749e3f 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/PersonCast.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/PersonCast.java
@@ -45,7 +45,6 @@ public class PersonCast extends AbstractJsonMapping {
     @JsonProperty("cast_id")
     private int castId;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getCharacter() {
         return character;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java b/src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java
index de83ff73b..47f0d369c 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java
@@ -52,7 +52,6 @@ public class PersonCredit extends AbstractJsonMapping {
     private String adult = DEFAULT_STRING;
     private PersonType personType = PersonType.PERSON;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
     public String getCharacter() {
         return character;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java b/src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java
index 6414a7b07..33f2ee42d 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java
@@ -43,7 +43,6 @@ public class PersonCrew extends AbstractJsonMapping {
     @JsonProperty("profile_path")
     private String profilePath;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getDepartment() {
         return department;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/ProductionCompany.java b/src/main/java/com/omertron/themoviedbapi/model/ProductionCompany.java
index 41859cc54..f7dbd7582 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/ProductionCompany.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/ProductionCompany.java
@@ -38,7 +38,6 @@ public class ProductionCompany extends AbstractJsonMapping {
     @JsonProperty("name")
     private String name;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public int getId() {
         return id;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java b/src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java
index 824cf6a52..2f33a3554 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java
@@ -38,7 +38,6 @@ public class ProductionCountry extends AbstractJsonMapping {
     @JsonProperty("name")
     private String name;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getIsoCode() {
         return isoCode;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java b/src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java
index 0def47954..bf71c8173 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java
@@ -38,7 +38,6 @@ public class ReleaseInfo extends AbstractJsonMapping {
     @JsonProperty("release_date")
     private String releaseDate;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getCertification() {
         return certification;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Reviews.java b/src/main/java/com/omertron/themoviedbapi/model/Reviews.java
index e9c722dea..5fbba3676 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Reviews.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Reviews.java
@@ -40,7 +40,6 @@ public class Reviews extends AbstractJsonMapping {
     @JsonProperty("url")
     private String url;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getId() {
         return id;
     }
@@ -56,9 +55,7 @@ public class Reviews extends AbstractJsonMapping {
     public String getUrl() {
         return url;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setId(String id) {
         this.id = id;
     }
@@ -74,5 +71,4 @@ public class Reviews extends AbstractJsonMapping {
     public void setUrl(String url) {
         this.url = url;
     }
-    // </editor-fold>
 }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/StatusCode.java b/src/main/java/com/omertron/themoviedbapi/model/StatusCode.java
index 3c86d14a6..860c5e54a 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/StatusCode.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/StatusCode.java
@@ -36,7 +36,6 @@ public class StatusCode extends AbstractJsonMapping {
     @JsonProperty("status_message")
     private String statusMessage;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public int getStatusCode() {
         return statusCode;
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java b/src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java
index 4c9b80d15..dadd2da1d 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java
@@ -46,7 +46,6 @@ public class TmdbConfiguration extends AbstractJsonMapping {
     @JsonProperty("logo_sizes")
     private List<String> logoSizes;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">//GEN-BEGIN:getterMethods
     public List<String> getBackdropSizes() {
         return backdropSizes;
     }
@@ -70,9 +69,7 @@ public class TmdbConfiguration extends AbstractJsonMapping {
     public String getSecureBaseUrl() {
         return secureBaseUrl;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">//GEN-BEGIN:setterMethods
     public void setBackdropSizes(List<String> backdropSizes) {
         this.backdropSizes = backdropSizes;
     }
@@ -96,7 +93,6 @@ public class TmdbConfiguration extends AbstractJsonMapping {
     public void setSecureBaseUrl(String secureBaseUrl) {
         this.secureBaseUrl = secureBaseUrl;
     }
-    // </editor-fold>
 
     /**
      * Copy the data from the passed object to this one
diff --git a/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java b/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java
index 174048e6a..c53cfeef0 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java
@@ -33,7 +33,6 @@ public class TokenAuthorisation extends AbstractJsonMapping {
     @JsonProperty("success")
     private Boolean success;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getExpires() {
         return expires;
     }
@@ -45,9 +44,7 @@ public class TokenAuthorisation extends AbstractJsonMapping {
     public Boolean getSuccess() {
         return success;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setExpires(String expires) {
         this.expires = expires;
     }
@@ -59,5 +56,4 @@ public class TokenAuthorisation extends AbstractJsonMapping {
     public void setSuccess(Boolean success) {
         this.success = success;
     }
-    // </editor-fold>
 }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java b/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java
index 861a820cc..c0c8a1098 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java
@@ -39,7 +39,6 @@ public class TokenSession extends AbstractJsonMapping {
     @JsonProperty("expires_at")
     private String expiresAt;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getSessionId() {
         return sessionId;
     }
@@ -63,9 +62,7 @@ public class TokenSession extends AbstractJsonMapping {
     public String getExpiresAt() {
         return expiresAt;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setSessionId(String sessionId) {
         this.sessionId = sessionId;
     }
@@ -89,5 +86,4 @@ public class TokenSession extends AbstractJsonMapping {
     public void setExpiresAt(String expiresAt) {
         this.expiresAt = expiresAt;
     }
-    // </editor-fold>
 }
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java b/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java
index 9cf92dad6..0df9719cd 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java
+++ b/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java
@@ -20,6 +20,7 @@
 package com.omertron.themoviedbapi.wrapper;
 
 import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
@@ -27,14 +28,10 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class AbstractWrapper extends AbstractJsonMapping {
+public abstract class AbstractWrapper extends AbstractJsonMapping implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private static Logger getLogger(Class<?> aClass) {
-        return LoggerFactory.getLogger(aClass);
-    }
-
     /**
      * Get a list of the enums passed
      *