Updated FeedFactory and FeedController