#19 Improved import