Scheduler Improvements