Refactored the way the datasetEvaluation works.