Retrofitted the refactoring into FeedConsumer
Changed the API of FeedConsumer to previous one so as not to break clients of this dependency