Refactor ScheduleUpdate