Updated Scheduler Interface