Refactored Feeder Factory