Updated WSRM with queues