working on subscription management