Improved import system