Fix DataImportService