Update to use queues