Modified QueueHandler