Add support for parallel queues