Updates to queues modules