Added more support for channel subscriptions.