Added support for unlimited concurrent connections