Added scoping of active subscriptions