diff --git a/build.gradle b/build.gradle
index be548a4..f5c5715 100644
--- a/build.gradle
+++ b/build.gradle
@@ -125,9 +125,9 @@
 
 	compile 'org.yaml:snakeyaml:1.13'
 	compile 'com.lmax:disruptor:3.2.1'
-	compile 'mysql:mysql-connector-java:5.1.31'
-	compile 'commons-pool:commons-pool:1.6'
-	compile 'commons-dbcp:commons-dbcp:1.4'
+	compile 'org.apache.commons:commons-dbcp2:2.1.1'
+	
+	runtime 'mysql:mysql-connector-java:5.1.31'
 
 	testCompile "org.codehaus.groovy:groovy-all:2.3.0"
 	testCompile "org.spockframework:spock-core:1.0-groovy-2.0-SNAPSHOT"
diff --git a/src/main/java/org/ultramine/server/UltraminePlugin.java b/src/main/java/org/ultramine/server/UltraminePlugin.java
index c550c25..3f8038a 100644
--- a/src/main/java/org/ultramine/server/UltraminePlugin.java
+++ b/src/main/java/org/ultramine/server/UltraminePlugin.java
@@ -36,7 +36,12 @@
 	public void injectData(Map<String, Object> data)
 	{
 		location = (File)data.get("coremodLocation");
-		((LaunchClassLoader)this.getClass().getClassLoader()).addTransformerExclusion("org.ultramine.server.asm.");
+		LaunchClassLoader cl = (LaunchClassLoader)this.getClass().getClassLoader();
+		cl.addTransformerExclusion("org.ultramine.server.asm.");
+		
+		cl.addTransformerExclusion("org.apache.commons.dbcp2.");
+		cl.addTransformerExclusion("org.apache.commons.pool2.");
+		cl.addTransformerExclusion("org.apache.commons.logging.");
 	}
 
 	@Override
diff --git a/src/main/java/org/ultramine/server/data/Databases.java b/src/main/java/org/ultramine/server/data/Databases.java
index f1e9101..e180566 100644
--- a/src/main/java/org/ultramine/server/data/Databases.java
+++ b/src/main/java/org/ultramine/server/data/Databases.java
@@ -5,7 +5,7 @@
 
 import javax.sql.DataSource;
 
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.ultramine.server.ConfigurationHandler;
 import org.ultramine.server.UltramineServerConfig;
 
@@ -30,7 +30,9 @@
 			ds.setUsername(info.username);
 			ds.setPassword(info.password);
 			if(info.maxConnections > 0)
-				ds.setMaxActive(info.maxConnections);
+				ds.setMaxIdle(info.maxConnections);
+			ds.setTestWhileIdle(true);
+			ds.setTestOnBorrow(false);
 			
 			databases.put(ent.getKey(), ds);
 		}