Add support for concurrent connections