Made importer more flexible