Added OOD and XST queues