diff --git a/cme/modules/get_netconnections.py b/cme/modules/get_netconnections.py
index df8c636e..4eeb7a78 100755
--- a/cme/modules/get_netconnections.py
+++ b/cme/modules/get_netconnections.py
@@ -28,11 +28,12 @@ class CMEModule:
     def on_admin_login(self, context, connection):
         data = []
         cards = connection.wmi(f"select DNSDomainSuffixSearchOrder, IPAddress from win32_networkadapterconfiguration")
-        for c in cards:
-            if c["IPAddress"].get("value"):
-                context.log.success(f"IP Address: {c['IPAddress']['value']}\tSearch Domain: {c['DNSDomainSuffixSearchOrder']['value']}")
+        if cards:
+            for c in cards:
+                if c["IPAddress"].get("value"):
+                    context.log.success(f"IP Address: {c['IPAddress']['value']}\tSearch Domain: {c['DNSDomainSuffixSearchOrder']['value']}")
 
-        data.append(cards)
+            data.append(cards)
 
         log_name = "network-connections-{}-{}.log".format(connection.args.target[0], datetime.now().strftime("%Y-%m-%d_%H%M%S"))
         write_log(json.dumps(data), log_name)
diff --git a/cme/modules/wcc.py b/cme/modules/wcc.py
index 30850fbc..690d806e 100644
--- a/cme/modules/wcc.py
+++ b/cme/modules/wcc.py
@@ -503,7 +503,7 @@ class HostChecker:
 
     def check_last_successful_update(self):
         records = self.connection.wmi(wmi_query='Select TimeGenerated FROM Win32_ReliabilityRecords Where EventIdentifier=19', namespace='root\\cimv2')
-        if len(records) == 0:
+        if isinstance(records, bool) or len(records) == 0:
             return False, ['No update found']
         most_recent_update_date = records[0]['TimeGenerated']['value']
         most_recent_update_date = most_recent_update_date.split('.')[0]
diff --git a/cme/protocols/smb.py b/cme/protocols/smb.py
index ae7fad6f..9d417f17 100755
--- a/cme/protocols/smb.py
+++ b/cme/protocols/smb.py
@@ -56,7 +56,10 @@ from dploot.lib.target import Target
 from dploot.lib.smb import DPLootSMBConnection
 
 from pywerview.cli.helpers import *
-from pywerview.requester import RPCRequester
+
+from impacket.dcerpc.v5.dtypes import NULL
+from impacket.dcerpc.v5.dcomrt import DCOMConnection
+from impacket.dcerpc.v5.dcom.wmi import CLSID_WbemLevel1Login, IID_IWbemLevel1Login, WBEM_FLAG_FORWARD_ONLY, IWbemLevel1Login
 
 from time import time
 from datetime import datetime
@@ -1208,45 +1211,55 @@ class smb(connection):
     def pass_pol(self):
         return PassPolDump(self).dump()
 
+    @requires_admin
     def wmi(self, wmi_query=None, namespace=None):
         records = []
+        if not wmi_query:
+            wmi_query = self.args.wmi.strip('\n')
+
         if not namespace:
             namespace = self.args.wmi_namespace
 
         try:
-            rpc = RPCRequester(
-                self.host,
-                self.domain,
-                self.username,
-                self.password,
-                self.lmhash,
-                self.nthash,
-            )
-            rpc._create_wmi_connection(namespace=namespace)
-
-            if wmi_query:
-                query = rpc._wmi_connection.ExecQuery(wmi_query, lFlags=WBEM_FLAG_FORWARD_ONLY)
-            else:
-                query = rpc._wmi_connection.ExecQuery(self.args.wmi, lFlags=WBEM_FLAG_FORWARD_ONLY)
+            dcom = DCOMConnection(self.conn.getRemoteName(), self.username, self.password, self.domain, self.lmhash, self.nthash, oxidResolver=True, doKerberos=self.kerberos ,kdcHost=self.kdcHost, aesKey=self.aesKey)
+            iInterface = dcom.CoCreateInstanceEx(CLSID_WbemLevel1Login,IID_IWbemLevel1Login)
+            flag, stringBinding =  dcom_FirewallChecker(iInterface, self.args.dcom_timeout)
+            if not flag:
+                self.logger.fail(f'WMI Query: Dcom initialization failed on connection with stringbinding: "{stringBinding}", please increase the timeout with the option "--dcom-timeout". If it\'s still failing maybe something is blocking the RPC connection')
+                # Make it force break function
+                dcom.disconnect()
+                return False
+            iWbemLevel1Login = IWbemLevel1Login(iInterface)
+            iWbemServices= iWbemLevel1Login.NTLMLogin(namespace , NULL, NULL)
+            iWbemLevel1Login.RemRelease()
+            iEnumWbemClassObject = iWbemServices.ExecQuery(wmi_query)
         except Exception as e:
-            self.logger.fail(f"Error creating WMI connection: {e}")
-            return records
-
-        while True:
+            self.logger.fail('Execute WQL error: {}'.format(e))
+            iWbemServices.RemRelease()
+            dcom.disconnect()
+            return False
+        else:
+            self.logger.info(f"Executing WQL syntax: {wmi_query}")
+            while True:
+                try:
+                    wmi_results = iEnumWbemClassObject.Next(0xffffffff, 1)[0]
+                    record = wmi_results.getProperties()
+                    records.append(record)
+                    for k,v in record.items():
+                        self.logger.highlight(f"{k} => {v['value']}")
+                except Exception as e:
+                    if str(e).find('S_FALSE') < 0:
+                        raise e
+                    else:
+                        break
             try:
-                wmi_results = query.Next(0xFFFFFFFF, 1)[0]
-                record = wmi_results.getProperties()
-                records.append(record)
-                for k, v in record.items():
-                    self.logger.highlight(f"{k} => {v['value']}")
-                self.logger.highlight("")
-            except Exception as e:
-                if str(e).find("S_FALSE") < 0:
-                    raise e
-                else:
-                    break
+                iEnumWbemClassObject.RemRelease()
+                iWbemServices.RemRelease()
+                dcom.disconnect()
+            except:
+                pass
 
-        return records
+            return records
 
     def spider(
         self,