More flexible importer