fixed sfi + added generic wrapper/importer