Improved the import process.