Improved Scheduler component