Initial revision of connection pool