Switched to HikariCP and Spring 4