Working on the importer