Add improvements to user subscription management.