Refactored asset loaders