Improvements to Scheduler