Added support for queues