Scheduler implementation updates 5