Updated loaders to use new API