Move more code from Subscription to SubscriptionClient