Refactored FileProvider