Refactored Export