Loader refactoring part1