Refactoring for Export class