Better handling of user subscriptions