improved Scheduler and relavant classes