Updated evaluator classes