Adding andX, orX to the ExpressionBuilder