Scheduler implementation updates 1