Refactoring of Loader