Maintain legacy queues temporarily