Refactored subscriptions in feed base