Loader class refactoring