Adapt importer to the new model