Added tracking capability for subscriptions