Refactor ScheduleImport