Improved ConnectionPool