Make importer international, part 2