Add end of queue detectors, more back options