Small refactoring of Feeder