Add Evaluator implementation