Improved import functionality.