diff --git a/agi/agi.xml b/agi/agi.xml
index 1ae3c0e315..2211310ddd 100644
--- a/agi/agi.xml
+++ b/agi/agi.xml
@@ -1,14 +1,18 @@
 <category name="MENUSELECT_AGIS" displayname="AGI Samples" positive_output="yes">
   <member name="agi-test.agi">
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
   </member>
   <member name="eagi-test">
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
   </member>
   <member name="eagi-sphinx-test">
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
   </member>
   <member name="jukebox.agi">
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
   </member>
 </category>
diff --git a/build_tools/cflags-devmode.xml b/build_tools/cflags-devmode.xml
index e47e7160b4..e3455b2077 100644
--- a/build_tools/cflags-devmode.xml
+++ b/build_tools/cflags-devmode.xml
@@ -1,25 +1,36 @@
 	<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags - Development">
 		<member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
+			<support_level>extended</support_level>
 		</member>
 		<member name="DEBUG_SCHEDULER" displayname="Enable Scheduler Debugging Output">
+			<support_level>extended</support_level>
 		</member>
 		<member name="DEBUG_THREADLOCALS" displayname="Enable Thread-Local-Storage Debugging">
+			<support_level>extended</support_level>
 		</member>
 		<member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks">
 			<depend>DEBUG_THREADS</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
+			<support_level>extended</support_level>
 		</member>
 		<member name="TRACE_FRAMES" displayname="Trace Frame Allocations">
+			<support_level>extended</support_level>
 		</member>
 		<member name="DO_CRASH" displayname="Crash on fatal errors">
+			<support_level>extended</support_level>
 		</member>
 		<member name="THREAD_CRASH" displayname="Crash on mutex errors">
+			<support_level>extended</support_level>
 		</member>
 		<member name="CHANNEL_TRACE" displayname="Enable CHANNEL(trace) function">
+			<support_level>extended</support_level>
 		</member>
 		<member name="SKINNY_DEVMODE" displayname="Enable Skinny Dev Mode">
+			<support_level>extended</support_level>
 		</member>
 		<member name="TEST_FRAMEWORK" displayname="Enable Test Framework API">
+			<support_level>extended</support_level>
 		</member>
 	</category>
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index 7ba685c762..2bd8fd2f2e 100644
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -4,6 +4,7 @@
 		<member name="DEBUG_THREADS" displayname="Enable Thread Debugging">
 		</member>
 		<member name="STATIC_BUILD" displayname="Build static binaries">
+			<support_level>extended</support_level>
 		</member>
 		<member name="LOADABLE_MODULES" displayname="Runtime module loading">
 			<defaultenabled>yes</defaultenabled>
@@ -14,49 +15,63 @@
 			<depend>bison</depend>
 			<depend>flex</depend>
 			<defaultenabled>no</defaultenabled>
+			<support_level>extended</support_level>
 		</member>
 		<member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
+			<support_level>extended</support_level>
 		</member>
 		<member name="BETTER_BACKTRACES" displayname="Use libbfd (GPL) to generate better inline backtraces">
 			<depend>BFD</depend>
 			<depend>DLADDR</depend>
 			<defaultenabled>no</defaultenabled>
+			<support_level>extended</support_level>
 		</member>
 		<member name="USE_HOARD_ALLOCATOR" displayname="Use the Hoard Memory Allocator instead of the default system one">
 			<defaultenabled>no</defaultenabled>
 			<depend>hoard</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="LOTS_OF_SPANS" displayname="More than 32 DAHDI spans">
 		</member>
 		<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
+			<support_level>extended</support_level>
 		</member>
 		<member name="G711_NEW_ALGORITHM" displayname="Use the NEW ulaw/alaw codecs (slower, but cleaner)">
 			<defaultenabled>no</defaultenabled>
+			<support_level>extended</support_level>
 		</member>
 		<member name="G711_REDUCED_BRANCHING" displayname="New ulaw/alaw codec, reduced branching (might help it run faster in some architectures)">
 			<depend>G711_NEW_ALGORITHM</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="TEST_CODING_TABLES" displayname="New ulaw/alaw codec, turn on table tests on init">
 			<depend>G711_NEW_ALGORITHM</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="TEST_TANDEM_TRANSCODING" displayname="New ulaw/alaw codec, turn on transcoding tests on init">
 			<depend>G711_NEW_ALGORITHM</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
 		</member>
 		<member name="BUSYDETECT_TONEONLY" displayname="Enable additional comparision of only the tone duration not the silence part">
 			<conflict>BUSYDETECT_COMPARE_TONE_AND_SILENCE</conflict>
 			<defaultenabled>no</defaultenabled>
+			<support_level>extended</support_level>
 		</member>
 		<member name="BUSYDETECT_COMPARE_TONE_AND_SILENCE" displayname="Assume that tone and silence have the same duration">
 			<conflict>BUSYDETECT_TONEONLY</conflict>
 			<defaultenabled>no</defaultenabled>
+			<support_level>extended</support_level>
 		</member>
 		<member name="BUSYDETECT_DEBUG" displayname="Enable additional busy detection debugging">
 			<defaultenabled>no</defaultenabled>
+			<support_level>extended</support_level>
 		</member>
 		<member name="IAX_OLD_FIND" displayname="Use the old, slow method of searching for IAX callnos">
+			<support_level>extended</support_level>
 		</member>
 		<member name="INTEGER_CALLERID" displayname="Use the (less accurate) integer-based method for decoding FSK tones (for embedded systems)">
+			<support_level>extended</support_level>
 		</member>
 	</category>
diff --git a/build_tools/embed_modules.xml b/build_tools/embed_modules.xml
index c38be80319..bf13ea9909 100644
--- a/build_tools/embed_modules.xml
+++ b/build_tools/embed_modules.xml
@@ -1,35 +1,46 @@
 	<category name="MENUSELECT_EMBED" displayname="Module Embedding" positive_output="yes" remove_on_change="main/asterisk">
 		<member name="ADDONS" displayname="Add-ons" remove_on_change="addons/*.o addons/*.oo">
 			<depend>gnu_ld</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="APPS" displayname="Applications" remove_on_change="apps/*.o apps/*.oo">
 			<depend>gnu_ld</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="BRIDGES" displayname="Bridging Technologies" remove_on_change="bridges/*.o bridges/*.oo">
 			<depend>gnu_ld</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="CDR" displayname="Call Detail Recording" remove_on_change="cdr/*.o cdr/*.oo">
 			<depend>gnu_ld</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="CHANNELS" displayname="Channels" remove_on_change="channels/*.o channels/*/*.o channels/*.oo channels/*/*.oo">
 			<depend>gnu_ld</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="CODECS" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/*/*.o codecs/*/*/*.o codecs/*/*.a codecs/*/*/*.a codecs/*.oo codecs/*/*.oo">
 			<depend>gnu_ld</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="FORMATS" displayname="File Formats" remove_on_change="formats/*.o formats/*.oo">
 			<depend>gnu_ld</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="FUNCS" displayname="Dialplan Functions" remove_on_change="funcs/*.o funcs/*.oo">
 			<depend>gnu_ld</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="PBX" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/*/*.o pbx/*.oo pbx/*/*.oo">
 			<depend>gnu_ld</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="RES" displayname="Resource Modules" remove_on_change="res/*.o res/*/*.o res/*.oo res/*/*.oo">
 			<depend>gnu_ld</depend>
+			<support_level>extended</support_level>
 		</member>
 		<member name="TEST" displayname="Test Modules" remove_on_change="tests/*.o tests/*.oo">
 			<depend>gnu_ld</depend>
+			<support_level>extended</support_level>
 		</member>
 	</category>
diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c
index e3d605a3c8..e89cf302e4 100644
--- a/channels/chan_usbradio.c
+++ b/channels/chan_usbradio.c
@@ -46,10 +46,12 @@
 	<member name="RADIO_RTX" displayname="Build RTX/DTX Radio Programming" touch_on_change="channels/chan_usbradio.c channels/xpmr/xpmr.h">
 		<defaultenabled>no</defaultenabled>
 		<depend>chan_usbradio</depend>
+		<support_level>extended</support_level>
 	</member>
 	<member name="RADIO_XPMRX" displayname="Build Experimental Radio Protocols" touch_on_change="channels/chan_usbradio.c">
 		<defaultenabled>no</defaultenabled>
 		<depend>chan_usbradio</depend>
+		<support_level>extended</support_level>
 	</member>
 </category>
  ***/
diff --git a/tests/test_db.c b/tests/test_db.c
index 1bd69f0c1c..68dc5bd088 100644
--- a/tests/test_db.c
+++ b/tests/test_db.c
@@ -26,7 +26,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
-	<support_level>core</support_level>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_netsock2.c b/tests/test_netsock2.c
index 194198e15b..06406bd143 100644
--- a/tests/test_netsock2.c
+++ b/tests/test_netsock2.c
@@ -26,7 +26,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
-	<support_level>core</support_level>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/utils/utils.xml b/utils/utils.xml
index fea5f31976..207495f52e 100644
--- a/utils/utils.xml
+++ b/utils/utils.xml
@@ -1,6 +1,7 @@
 <category name="MENUSELECT_UTILS" displayname="Utilities" positive_output="yes">
   <member name="aelparse">
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
   </member>
   <member name="astcanary">
 	<defaultenabled>yes</defaultenabled>
@@ -11,36 +12,47 @@
   <member name="astman">
 	<defaultenabled>no</defaultenabled>
 	<depend>newt</depend>
+	<support_level>extended</support_level>
   </member>
   <member name="check_expr">
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
   </member>
   <member name="check_expr2">
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
   </member>
   <member name="conf2ael">
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
   </member>
   <member name="hashtest">
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
   </member>
   <member name="hashtest2">
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
   </member>
   <member name="muted">
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
   </member>
   <member name="refcounter">
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
   </member>
   <member name="smsq">
 	<defaultenabled>no</defaultenabled>
 	<depend>popt</depend>
+	<support_level>extended</support_level>
   </member>
   <member name="stereorize">
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
   </member>
   <member name="streamplayer">
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
   </member>
 </category>