diff --git a/src/common/capwap_element.c b/src/common/capwap_element.c
index 913f37f..0307a67 100644
--- a/src/common/capwap_element.c
+++ b/src/common/capwap_element.c
@@ -3,9 +3,6 @@
 #include "capwap_protocol.h"
 #include "capwap_array.h"
 
-#define CAPWAP_MESSAGE_ELEMENT_SINGLE			0
-#define CAPWAP_MESSAGE_ELEMENT_ARRAY			1
-
 /* */
 static int capwap_get_message_element_category(uint16_t type) {
 	switch (type) {
@@ -18,6 +15,7 @@ static int capwap_get_message_element_category(uint16_t type) {
 		case CAPWAP_ELEMENT_RETURNEDMESSAGE:
 		case CAPWAP_ELEMENT_80211_ANTENNA:
 		case CAPWAP_ELEMENT_80211_DIRECTSEQUENCECONTROL:
+		case CAPWAP_ELEMENT_80211_IE:
 		case CAPWAP_ELEMENT_80211_MACOPERATION:
 		case CAPWAP_ELEMENT_80211_MIC_COUNTERMEASURES:
 		case CAPWAP_ELEMENT_80211_MULTIDOMAINCAPABILITY:
@@ -128,9 +126,9 @@ static struct capwap_message_elements_ops* capwap_80211_message_elements[CAPWAP_
 
 /* */
 struct capwap_message_elements_ops* capwap_get_message_element_ops(unsigned short code) {
-	if ((code >= CAPWAP_MESSAGE_ELEMENTS_START) && (code <= CAPWAP_MESSAGE_ELEMENTS_STOP)) {
+	if (IS_MESSAGE_ELEMENTS(code)) {
 		return capwap_message_elements[code - CAPWAP_MESSAGE_ELEMENTS_START];
-	} else if ((code >= CAPWAP_80211_MESSAGE_ELEMENTS_START) && (code <= CAPWAP_80211_MESSAGE_ELEMENTS_STOP)) {
+	} else if (IS_80211_MESSAGE_ELEMENTS(code)) {
 		return capwap_80211_message_elements[code - CAPWAP_80211_MESSAGE_ELEMENTS_START];
 	}
 	
diff --git a/src/common/capwap_element.h b/src/common/capwap_element.h
index 43b52ce..979a575 100644
--- a/src/common/capwap_element.h
+++ b/src/common/capwap_element.h
@@ -117,6 +117,9 @@ struct capwap_message_elements_ops* capwap_get_message_element_ops(unsigned shor
 #include "capwap_element_80211_wtpradioinformation.h"	/* 01048 */
 
 /*********************************************************************************************************************/
+#define CAPWAP_MESSAGE_ELEMENT_SINGLE			0
+#define CAPWAP_MESSAGE_ELEMENT_ARRAY			1
+
 struct capwap_message_element_itemlist {
 	uint16_t type;
 	int category;
diff --git a/src/common/capwap_element_80211_updatestationqos.h b/src/common/capwap_element_80211_updatestationqos.h
index bbe2f68..bd7bd01 100644
--- a/src/common/capwap_element_80211_updatestationqos.h
+++ b/src/common/capwap_element_80211_updatestationqos.h
@@ -1,7 +1,7 @@
 #ifndef __CAPWAP_ELEMENT_80211_UPDATE_STATION_QOS_HEADER__
 #define __CAPWAP_ELEMENT_80211_UPDATE_STATION_QOS_HEADER__
 
-#define CAPWAP_ELEMENT_80211_UPDATE_STATION_QOS		1042
+#define CAPWAP_ELEMENT_80211_UPDATE_STATION_QOS		1043
 
 #define CAPWAP_UPDATE_STATION_QOS_ADDRESS_LENGTH			6
 #define CAPWAP_UPDATE_STATION_QOS_SUBELEMENTS				4
diff --git a/src/common/capwap_rfc.h b/src/common/capwap_rfc.h
index 2cfc6b0..4941852 100644
--- a/src/common/capwap_rfc.h
+++ b/src/common/capwap_rfc.h
@@ -195,8 +195,11 @@ struct capwap_macaddress_eui64 {
 
 #define IS_VALID_MACADDRESS_LENGTH(x)		((x == MACADDRESS_EUI48_LENGTH) || (x == MACADDRESS_EUI64_LENGTH))
 
-#define IS_VALID_RADIOID(x)					((x >= 1) && (x <= 31))
-#define IS_VALID_WLANID(x)					((x >= 1) && (x <= 16))
+#define RADIOID_MAX_COUNT					31
+#define IS_VALID_RADIOID(x)					((x >= 1) && (x <= RADIOID_MAX_COUNT))
+
+#define WLANID_MAX_COUNT					16
+#define IS_VALID_WLANID(x)					((x >= 1) && (x <= WLANID_MAX_COUNT))
 
 /* Standard message elements 1 -> 52 (1 - 1023) */
 #define CAPWAP_MESSAGE_ELEMENTS_START				1