Adding better support for adding subscriptions