Added a subscription manager