loaders refactorings