More Updates to Scheduler