Add support for broadcast and subscription channels