Export refactoring