More work on the advanced importers.