make Loader interface a bit more consistent merged-on-behalf-of: BBasile <BBasile@users.noreply.github.com>