ExpressionEvaluator updated