Refactored loaders