improve subscription management