Improved import routine