Is there a need to redefine the diagnostic criteria for common variable immunodeficiency?

Is there a need to redefine the diagnostic criteria for common variable immunodeficiency?