Fixed exporter class