Add code to allow multiple clients to wait on the same stream concurrently