Add support for Subscriptions