diff --git a/pom.xml b/pom.xml
index 21798f9..e823c65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <!-- General properties -->
     <groupId>com.github.agadar</groupId>
     <artifactId>nationstates-api-java-wrapper</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
     <packaging>jar</packaging>   
     <name>NationStates API Java Wrapper</name>
     <description>A Java library for consuming the NationStates API.</description>
diff --git a/src/main/java/com/github/agadar/nationstates/NationStates.java b/src/main/java/com/github/agadar/nationstates/NationStates.java
index 78f51a9..cd74a4b 100644
--- a/src/main/java/com/github/agadar/nationstates/NationStates.java
+++ b/src/main/java/com/github/agadar/nationstates/NationStates.java
@@ -36,7 +36,7 @@
  *
  * @author Agadar (https://github.com/Agadar/)
  */
-public final class NationStates implements INationStates {
+public class NationStates implements INationStates {
 
     /**
      * The NationStates API version this wrapper uses.
diff --git a/src/main/java/com/github/agadar/nationstates/NationStatesAPIException.java b/src/main/java/com/github/agadar/nationstates/NationStatesAPIException.java
index cbb5818..3d68996 100644
--- a/src/main/java/com/github/agadar/nationstates/NationStatesAPIException.java
+++ b/src/main/java/com/github/agadar/nationstates/NationStatesAPIException.java
@@ -7,7 +7,7 @@
  *
  * @author Agadar (https://github.com/Agadar/)
  */
-public final class NationStatesAPIException extends RuntimeException {
+public class NationStatesAPIException extends RuntimeException {
 
     public NationStatesAPIException() {
         super();
diff --git a/src/main/java/com/github/agadar/nationstates/adapter/ColonSeparatedToSetAdapter.java b/src/main/java/com/github/agadar/nationstates/adapter/ColonSeparatedToSetAdapter.java
index f39362d..49aac2b 100644
--- a/src/main/java/com/github/agadar/nationstates/adapter/ColonSeparatedToSetAdapter.java
+++ b/src/main/java/com/github/agadar/nationstates/adapter/ColonSeparatedToSetAdapter.java
@@ -11,7 +11,7 @@
  *
  * @author Agadar (https://github.com/Agadar/)
  */
-public final class ColonSeparatedToSetAdapter extends XmlAdapter<String, Set<String>> {
+public class ColonSeparatedToSetAdapter extends XmlAdapter<String, Set<String>> {
 
     @Override
     public String marshal(Set<String> bt) {
diff --git a/src/main/java/com/github/agadar/nationstates/adapter/CommaSeparatedToSetAdapter.java b/src/main/java/com/github/agadar/nationstates/adapter/CommaSeparatedToSetAdapter.java
index 838337c..b1c6fb8 100644
--- a/src/main/java/com/github/agadar/nationstates/adapter/CommaSeparatedToSetAdapter.java
+++ b/src/main/java/com/github/agadar/nationstates/adapter/CommaSeparatedToSetAdapter.java
@@ -11,7 +11,7 @@
  *
  * @author Agadar (https://github.com/Agadar/)
  */
-public final class CommaSeparatedToSetAdapter extends XmlAdapter<String, Set<String>> {
+public class CommaSeparatedToSetAdapter extends XmlAdapter<String, Set<String>> {
 
     @Override
     public String marshal(Set<String> bt) {
diff --git a/src/main/java/com/github/agadar/nationstates/query/NationQuery.java b/src/main/java/com/github/agadar/nationstates/query/NationQuery.java
index 2975229..2d14a79 100644
--- a/src/main/java/com/github/agadar/nationstates/query/NationQuery.java
+++ b/src/main/java/com/github/agadar/nationstates/query/NationQuery.java
@@ -10,7 +10,7 @@
  *
  * @author Agadar (https://github.com/Agadar/)
  */
-public final class NationQuery extends CensusQuery<NationQuery, Nation, NationShard> {
+public class NationQuery extends CensusQuery<NationQuery, Nation, NationShard> {
 
     /**
      * See canReceiveTelegramFromRegion(...).
diff --git a/src/main/java/com/github/agadar/nationstates/query/RegionQuery.java b/src/main/java/com/github/agadar/nationstates/query/RegionQuery.java
index 85d9ada..02eeb77 100644
--- a/src/main/java/com/github/agadar/nationstates/query/RegionQuery.java
+++ b/src/main/java/com/github/agadar/nationstates/query/RegionQuery.java
@@ -10,7 +10,7 @@
  *
  * @author Agadar (https://github.com/Agadar/)
  */
-public final class RegionQuery extends CensusRankQuery<RegionQuery, Region, RegionShard> {
+public class RegionQuery extends CensusRankQuery<RegionQuery, Region, RegionShard> {
 
     /**
      * Offset for the 10 most recent regional messages.
diff --git a/src/main/java/com/github/agadar/nationstates/query/TelegramQuery.java b/src/main/java/com/github/agadar/nationstates/query/TelegramQuery.java
index 79a0c9c..27d5b6b 100644
--- a/src/main/java/com/github/agadar/nationstates/query/TelegramQuery.java
+++ b/src/main/java/com/github/agadar/nationstates/query/TelegramQuery.java
@@ -14,7 +14,7 @@
  *
  * @author Agadar (https://github.com/Agadar/)
  */
-public final class TelegramQuery extends APIQuery<TelegramQuery, Void> {
+public class TelegramQuery extends APIQuery<TelegramQuery, Void> {
 
     /**
      * The rate limiter for normal telegrams.
diff --git a/src/main/java/com/github/agadar/nationstates/query/VerifyQuery.java b/src/main/java/com/github/agadar/nationstates/query/VerifyQuery.java
index 221d590..a461edf 100644
--- a/src/main/java/com/github/agadar/nationstates/query/VerifyQuery.java
+++ b/src/main/java/com/github/agadar/nationstates/query/VerifyQuery.java
@@ -11,7 +11,7 @@
  *
  * @author Agadar (https://github.com/Agadar/)
  */
-public final class VerifyQuery extends APIQuery<VerifyQuery, Boolean> {
+public class VerifyQuery extends APIQuery<VerifyQuery, Boolean> {
 
     /**
      * The nation to verify.
diff --git a/src/main/java/com/github/agadar/nationstates/query/VersionQuery.java b/src/main/java/com/github/agadar/nationstates/query/VersionQuery.java
index 5c201dd..41a6e03 100644
--- a/src/main/java/com/github/agadar/nationstates/query/VersionQuery.java
+++ b/src/main/java/com/github/agadar/nationstates/query/VersionQuery.java
@@ -11,7 +11,7 @@
  *
  * @author Agadar (https://github.com/Agadar/)
  */
-public final class VersionQuery extends APIQuery<VersionQuery, Integer> {
+public class VersionQuery extends APIQuery<VersionQuery, Integer> {
 
     /**
      * Constructor.
diff --git a/src/main/java/com/github/agadar/nationstates/query/WorldAssemblyQuery.java b/src/main/java/com/github/agadar/nationstates/query/WorldAssemblyQuery.java
index 07d9eb0..0240e2d 100644
--- a/src/main/java/com/github/agadar/nationstates/query/WorldAssemblyQuery.java
+++ b/src/main/java/com/github/agadar/nationstates/query/WorldAssemblyQuery.java
@@ -11,7 +11,7 @@
  *
  * @author Agadar (https://github.com/Agadar/)
  */
-public final class WorldAssemblyQuery extends ShardQuery<WorldAssemblyQuery, WorldAssembly, WorldAssemblyShard> {
+public class WorldAssemblyQuery extends ShardQuery<WorldAssemblyQuery, WorldAssembly, WorldAssemblyShard> {
 
     /**
      * The id of the resolution to retrieve.
diff --git a/src/main/java/com/github/agadar/nationstates/query/WorldQuery.java b/src/main/java/com/github/agadar/nationstates/query/WorldQuery.java
index fa590b9..ff02c7c 100644
--- a/src/main/java/com/github/agadar/nationstates/query/WorldQuery.java
+++ b/src/main/java/com/github/agadar/nationstates/query/WorldQuery.java
@@ -14,7 +14,7 @@
  *
  * @author Agadar (https://github.com/Agadar/)
  */
-public final class WorldQuery extends CensusRankQuery<WorldQuery, World, WorldShard> {
+public class WorldQuery extends CensusRankQuery<WorldQuery, World, WorldShard> {
 
     /**
      * Nation to list dispatches of.
diff --git a/src/main/java/com/github/agadar/nationstates/ratelimiter/DependantRateLimiter.java b/src/main/java/com/github/agadar/nationstates/ratelimiter/DependantRateLimiter.java
index fe9b82c..c258706 100644
--- a/src/main/java/com/github/agadar/nationstates/ratelimiter/DependantRateLimiter.java
+++ b/src/main/java/com/github/agadar/nationstates/ratelimiter/DependantRateLimiter.java
@@ -5,7 +5,7 @@
  *
  * @author Agadar (https://github.com/Agadar/)
  */
-public final class DependantRateLimiter extends RateLimiter {
+public class DependantRateLimiter extends RateLimiter {
 
     /**
      * The rate limiter this one is dependant on.
diff --git a/src/main/java/com/github/agadar/nationstates/xmlconverter/XmlConverter.java b/src/main/java/com/github/agadar/nationstates/xmlconverter/XmlConverter.java
index 019bb0b..9a231ed 100644
--- a/src/main/java/com/github/agadar/nationstates/xmlconverter/XmlConverter.java
+++ b/src/main/java/com/github/agadar/nationstates/xmlconverter/XmlConverter.java
@@ -20,7 +20,7 @@
  *
  * @author Agadar (https://github.com/Agadar/)
  */
-public final class XmlConverter implements IXmlConverter {
+public class XmlConverter implements IXmlConverter {
 
     /**
      * The JAXBContext for this API.