Refactorisation for "Loader" logic