Refactored file loader again