Add support for Queues