Modified so that the queue is in the builder object