Updated loaders