Minor Adjustment to Export Module