Improve exporter