Updated QueueHandler