Improved import process