Scheduler improvement