Refactored Loader