Refactor subscriptions.