Refactoring to enable multiple load