Moved feeder queueing to own class