move upgrade helpers to Subscription