Adding the connection pool back with the bug fixes