Refactored file loader yet again