Redesign Scheduler from pre-assignment to more flexible schedule-on-demand model