More changes for queue simulation.