Added experimental support for non-multiplexing connections