Improved Exporter Behavior