Add connection pool and strategies
Add tests, minor fixes