Converted to use connection_pool