Improved Factor exporting.