Updated schedulerHandler