Updated for changes in LightningQueues