Added support for PUB/SUB connection types