Updated exporter