Scheduler implementation updates 4