Updates to the evaluator
Put CodeDom reference back in