Added a more efficient Evaluator.