Scheduler changes