Added flags to both exporter and importer