Refactoring, Added Export