Improved FileImport