wishloader refactoring