Updated with Batch and Run queues