diff --git a/src/main/java/com/paymill/context/PaymillContext.java b/src/main/java/com/paymill/context/PaymillContext.java
index 990b3e6..3ce763c 100644
--- a/src/main/java/com/paymill/context/PaymillContext.java
+++ b/src/main/java/com/paymill/context/PaymillContext.java
@@ -39,7 +39,7 @@
  * @author Vassil Nikolov
  * @since 3.0.0
  */
-public final class PaymillContext {
+public class PaymillContext {
 
   public final static ObjectMapper PARSER     = new ObjectMapper();
   private final static Properties  PROPERTIES = new Properties();
diff --git a/src/main/java/com/paymill/services/ClientService.java b/src/main/java/com/paymill/services/ClientService.java
index e1cab4b..c391441 100644
--- a/src/main/java/com/paymill/services/ClientService.java
+++ b/src/main/java/com/paymill/services/ClientService.java
@@ -15,7 +15,7 @@
  * @author Vassil Nikolov
  * @since 3.0.0
  */
-public final class ClientService extends AbstractService {
+public class ClientService extends AbstractService {
 
   private ClientService( com.sun.jersey.api.client.Client httpClient ) {
     super( httpClient );