Adjusted to better connection pool library