Add check in ExpressionBuilder