diff --git a/src/capwap/capwap_items.c b/src/capwap/capwap_items.c
index 0454afcc..7c2bcd67 100644
--- a/src/capwap/capwap_items.c
+++ b/src/capwap/capwap_items.c
@@ -97,19 +97,34 @@ const char CW_ITEM_RADIO_INFOS[]="radio_infos";
 struct cw_itemdef capwap_itemdefs[] = {
 
 {CW_ITEM_WTP_NAME,CW_ITEM_NONE,MBAG_STR},
+{CW_ITEM_WTP_MAC_TYPE,CW_ITEM_NONE,MBAG_BYTE},
+{CW_ITEM_WTP_FRAME_TUNNEL_MODE,CW_ITEM_NONE,MBAG_BYTE},
 {CW_ITEM_LOCATION_DATA,CW_ITEM_NONE,MBAG_STR},
 {CW_ITEM_WTP_HARDWARE_VERSION,CW_ITEM_NONE,MBAG_VENDORSTR},
 {CW_ITEM_WTP_SOFTWARE_VERSION,CW_ITEM_NONE,MBAG_VENDORSTR},
 {CW_ITEM_WTP_GROUP_NAME,CW_ITEM_NONE,MBAG_STR},
 {CW_ITEM_MAXIMUM_MESSAGE_LENGTH,CW_ITEM_NONE,MBAG_WORD},
 {CW_ITEM_STATISTICS_TIMER,CW_ITEM_NONE,MBAG_WORD},
+{CW_ITEM_IDLE_TIMEOUT,CW_ITEM_NONE,MBAG_DWORD},
+{CW_ITEM_CAPWAP_TIMERS,CW_ITEM_NONE,MBAG_WORD},
 
+{CW_ITEM_AC_NAME_WITH_PRIORITY,CW_ITEM_ANY,MBAG_STR},
 
 
-{CW_ITEM_WTP_BOARD_DATA,CW_ITEM_NONE,MBAG_MBAG},
-
 {CW_ITEM_AP_MODE_AND_TYPE,CW_ITEM_NONE,MBAG_WORD},
-{CW_ITEM_WTP_BOARD_DATA,CW_ITEM_WTP_BOARD_VENDOR},
+
+/* Board Data */
+{CW_ITEM_WTP_BOARD_DATA,CW_ITEM_NONE,MBAG_MBAG},
+{CW_ITEM_WTP_BOARD_DATA,CW_ITEM_WTP_BOARD_VENDOR,MBAG_DWORD},
+{CW_ITEM_WTP_BOARD_DATA,CW_ITEM_WTP_BOARD_MODELNO,MBAG_BSTR16},
+{CW_ITEM_WTP_BOARD_DATA,CW_ITEM_WTP_BOARD_SERIALNO,MBAG_BSTR16},
+
+
+/* Cisco Specific items, should be moved to a file like 
+cisco_items or so */
+
+{CW_ITEM_AP_MODE_AND_TYPE,CW_ITEM_NONE,MBAG_WORD},
+{CW_ITEM_CISCO_BOARD_DATA_OPTIONS,CW_ITEM_NONE,MBAG_BSTR16},
 
 
 
@@ -117,3 +132,17 @@ struct cw_itemdef capwap_itemdefs[] = {
 
 };
 
+
+
+
+struct cw_itemdef capwap_radiodefs[] = {
+
+
+{CW_ITEM_NONE}
+};
+
+
+
+
+
+