add some more support for queues