Use new queues in API