Improved import system, part 2