Start updating the importer to the new architecture