Move subscriptions into components