Improved Scheduler Node handling