Refactored external files