Did some improvements to the scheduler object moving