Update exporter, multiple files and json2 format