More changes for queue.