Refactor to make LoaderFactory use IDataHolder.