Added support for subscriptions and notifications