Update Evaluator design, cut out generics and add dynamic evaluator instance making in the Aggregation process.