Refactoring of DataImport and models