Update ExpressionBuilder.php