Improved Unit Export