Add reschedule support, need test