user subscriptions improvements