Moved some code to ISubscriptionsService.