Changed Scheduler and TaskQueueManager