Adding support for named queues