Update to support default queues