Adding support for agent queues