Fix importer to use new format.