Added subscription management