Exporter Improvements