Loading refactoring