diff --git a/pom.xml b/pom.xml
index 2e46412..265ceae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,13 +18,13 @@
 	</scm>
 
 	<properties>
-
-		<flyway.version>6.0.7</flyway.version>
-		<mariadb.version>2.5.1</mariadb.version>
-		<hibernate.version>5.4.6.Final</hibernate.version>
-		<spring.version>5.2.0.RELEASE</spring.version>
-		<spring.boot.version>2.2.0.RELEASE</spring.boot.version>
-		<spring.data.version>2.2.0.RELEASE</spring.data.version>
+		<flyway.version>6.1.3</flyway.version>
+		<mariadb.version>2.5.2</mariadb.version>
+		<hibernate.version>5.4.10.Final</hibernate.version>
+		<spring.version>5.2.2.RELEASE</spring.version>
+		<spring.boot.version>2.2.2.RELEASE</spring.boot.version>
+		<spring.data.version>2.2.2.RELEASE</spring.data.version>
+		<jackson.version>2.10.1</jackson.version>
 		<log4j.version>2.12.1</log4j.version>
 		<slf4j.version>1.7.28</slf4j.version>
 		<maven.enforcer.version>3.0.0-M2</maven.enforcer.version>
@@ -154,7 +154,7 @@
 		<dependency>
 			<groupId>net.dv8tion</groupId>
 			<artifactId>JDA</artifactId>
-			<version>4.0.0_54</version>
+			<version>4.1.0_88</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.fasterxml.jackson.core</groupId>
@@ -174,7 +174,7 @@
 		<dependency>
 			<groupId>com.sedmelluq</groupId>
 			<artifactId>lavaplayer</artifactId>
-			<version>1.3.22</version>
+			<version>1.3.32</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.flywaydb/flyway-core -->
@@ -203,14 +203,13 @@
 			<version>${hibernate.version}</version>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-dbcp2 -->
+		<!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-c3p0 -->
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-dbcp2</artifactId>
-			<version>2.7.0</version>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-c3p0</artifactId>
+			<version>${hibernate.version}</version>
 		</dependency>
 
-
 		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -282,27 +281,27 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<version>2.10.0</version>
+			<version>${jackson.version}</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.10.0</version>
+			<version>${jackson.version}</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>2.10.0</version>
+			<version>${jackson.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
-			<version>2.3.1</version>
+			<version>2.4.0-b180830.0359</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-core -->
@@ -315,7 +314,7 @@
 		<dependency>
 			<groupId>com.sun.xml.bind</groupId>
 			<artifactId>jaxb-impl</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0-b180830.0438</version>
 		</dependency>
 
 		<dependency>
@@ -330,7 +329,7 @@
 			<artifactId>mp3agic</artifactId>
 			<version>0.9.1</version>
 		</dependency>
-		
+
 	</dependencies>
 
 	<distributionManagement>
diff --git a/src/main/java/net/locusworks/discord/eighttrack/database/config/EightTrackDataSource.java b/src/main/java/net/locusworks/discord/eighttrack/database/config/EightTrackDataSource.java
index a596f3d..d3c7f87 100644
--- a/src/main/java/net/locusworks/discord/eighttrack/database/config/EightTrackDataSource.java
+++ b/src/main/java/net/locusworks/discord/eighttrack/database/config/EightTrackDataSource.java
@@ -36,15 +36,7 @@ import java.util.stream.Collectors;
 
 import javax.sql.DataSource;
 
-import org.apache.commons.dbcp2.ConnectionFactory;
-import org.apache.commons.dbcp2.DriverManagerConnectionFactory;
-import org.apache.commons.dbcp2.PoolableConnection;
-import org.apache.commons.dbcp2.PoolableConnectionFactory;
-import org.apache.commons.dbcp2.PoolingDataSource;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.pool2.impl.AbandonedConfig;
-import org.apache.commons.pool2.impl.GenericObjectPool;
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.mariadb.jdbc.MariaDbDataSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,7 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
-
+import com.mchange.v2.c3p0.ComboPooledDataSource;
 import net.locusworks.discord.eighttrack.services.ConfigurationService;
 
 @Primary
@@ -104,8 +96,7 @@ public class EightTrackDataSource {
   }
   
   private DataSource getDataSource(Boolean isFlyway) throws Exception {
-    logger.debug("Gettind datasource");
-    Class.forName(DRIVER).getDeclaredConstructor().newInstance();
+    logger.debug("Getting datasource");
     
     String user = confService.getDatabaseUsername();
     String passwd = confService.getDatabasePassword();
@@ -129,34 +120,16 @@ public class EightTrackDataSource {
     
     logger.debug("Database connection string: %s", url);
     
-    ConnectionFactory cf = new DriverManagerConnectionFactory(url, props);
-    //Create the poolable connection factory 
-    PoolableConnectionFactory pcf = new PoolableConnectionFactory(cf, null);
-    pcf.setValidationQuery("SELECT 1");
-    pcf.setDefaultAutoCommit(true);
-
-    GenericObjectPoolConfig<PoolableConnection> poolConfig = new GenericObjectPoolConfig<>();
-    poolConfig.setMinIdle(10);
-    poolConfig.setMaxTotal(100);
-
-    AbandonedConfig abandonConfig = new AbandonedConfig();
-    abandonConfig.setRemoveAbandonedTimeout(60);
-    abandonConfig.setLogAbandoned(false);
-    abandonConfig.setRemoveAbandonedOnBorrow(true);
-    abandonConfig.setRemoveAbandonedOnMaintenance(true);
-
-    //Create the pool of connections
-    GenericObjectPool<PoolableConnection> connectionPool = new GenericObjectPool<>(pcf, poolConfig);
-    connectionPool.setTestOnBorrow(true);
-    connectionPool.setTestWhileIdle(true);
-    connectionPool.setTimeBetweenEvictionRunsMillis(10000);
-    connectionPool.setMinEvictableIdleTimeMillis(1000);
-    connectionPool.setAbandonedConfig(abandonConfig);
-    pcf.setPool(connectionPool);
-
-    //Pooling data source itself
-    PoolingDataSource<PoolableConnection> dataSource = new PoolingDataSource<>(connectionPool);
-    return dataSource;
+    ComboPooledDataSource cpds = new ComboPooledDataSource();
+    cpds.setDriverClass(DRIVER);
+    cpds.setJdbcUrl(url);
+    cpds.setUser(user);
+    cpds.setPassword(passwd);
+    cpds.setMinPoolSize(5);
+    cpds.setMaxPoolSize(100);
+    cpds.setAcquireIncrement(10);
+    
+    return cpds;
   }
 
 }