Improve feed_factory