Refactor to make LoaderFactory use IDataHolder.
Changed to use iterable method.