[CHG,IMP] Change Scheduler to new API