Improved import UX