diff --git a/README.md b/README.md
index c49d32c..759a49b 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,8 @@ The default configuration file comes with a sample configuration, making it easy
     capsman = True                  # CAPsMAN general metrics
     capsman_clients = True          # CAPsMAN clients metrics    
 
+    kid_control_devices = False     # Kid Control metrics 
+
     user = True                     # Active Users metrics
     queue = True                    # Queues metrics
     
diff --git a/mktxp/cli/output/wifi_out.py b/mktxp/cli/output/wifi_out.py
index bbd52e2..9a766df 100644
--- a/mktxp/cli/output/wifi_out.py
+++ b/mktxp/cli/output/wifi_out.py
@@ -43,7 +43,7 @@ class WirelessOutput:
         output_records = 0
         registration_records = len(registration_records)                
         output_entry = BaseOutputProcessor.OutputWiFiEntry \
-                        if WirelessMetricsDataSource.is_legacy(router_entry) else BaseOutputProcessor.OutputWirelessEntry
+                        if not WirelessMetricsDataSource.is_legacy(router_entry) else BaseOutputProcessor.OutputWirelessEntry
         output_table = BaseOutputProcessor.output_table(output_entry)
         
         for key in dhcp_rt_by_interface.keys():
diff --git a/mktxp/datasource/wireless_ds.py b/mktxp/datasource/wireless_ds.py
index 57bfd09..ec92368 100644
--- a/mktxp/datasource/wireless_ds.py
+++ b/mktxp/datasource/wireless_ds.py
@@ -23,6 +23,9 @@ class WirelessMetricsDataSource:
     WIRELESS = 'wireless'
     WIFI = 'wifi'
 
+    WIFI_PACKAGE = 'wifi-qcom'
+    WIFI_AC_PACKAGE = 'wifi-qcom-ac'
+
     @staticmethod
     def metric_records(router_entry, *, metric_labels = None, add_router_id = True):
         if metric_labels is None:
@@ -46,12 +49,14 @@ class WirelessMetricsDataSource:
     @staticmethod
     def wireless_package(router_entry):
         if not router_entry.wifi_package:
-            if PackageMetricsDataSource.is_package_installed(router_entry, package_name = WirelessMetricsDataSource.WIRELESS):
-              router_entry.wifi_package = WirelessMetricsDataSource.WIRELESS
+            if PackageMetricsDataSource.is_package_installed(router_entry, package_name = WirelessMetricsDataSource.WIFI_PACKAGE):
+              router_entry.wifi_package = WirelessMetricsDataSource.WIFI
+            elif PackageMetricsDataSource.is_package_installed(router_entry, package_name = WirelessMetricsDataSource.WIFI_AC_PACKAGE):
+              router_entry.wifi_package = WirelessMetricsDataSource.WIFI
             elif PackageMetricsDataSource.is_package_installed(router_entry, package_name = WirelessMetricsDataSource.WIFIWAVE2):
               router_entry.wifi_package = WirelessMetricsDataSource.WIFIWAVE2
             else:
-              router_entry.wifi_package = WirelessMetricsDataSource.WIFI
+              router_entry.wifi_package = WirelessMetricsDataSource.WIRELESS
         return router_entry.wifi_package
 
     @staticmethod