Improved import style