Export: Refactored