Improved import section