Updated loaders to take full set of options