Finished the refactoring of the loaders