Adding support for subscriptions