Merge: Loader refactor