Refactor FileLoadingService