Improved import