Adding evaluator code