Fix to removal of IDatasetLoader