master: Add QueueHandler