improve Subscriptions