Added validation for subscriptions