Improved import performance