Fixed importer code