Refactor DataImporterManager