Improved import slightly