diff --git a/cme/protocols/smb/database.py b/cme/protocols/smb/database.py
index e3c9e8e8..95b37367 100755
--- a/cme/protocols/smb/database.py
+++ b/cme/protocols/smb/database.py
@@ -19,7 +19,10 @@ class database:
             "os" text,
             "dc" boolean,
             "smbv1" boolean,
-            "signing" boolean
+            "signing" boolean,
+            "spooler" boolean,
+            "zerologon" boolean,
+            "petitpotam" boolean
             )''')
 
         # type = hash, plaintext
@@ -171,7 +174,7 @@ class database:
         return results
 
     #pull/545
-    def add_computer(self, ip, hostname, domain, os, smbv1, signing, dc=None):
+    def add_computer(self, ip, hostname, domain, os, smbv1, signing=None, spooler=None, zerologon=None, petitpotam=None, dc=None):
         """
         Check if this host has already been added to the database, if not add it in.
         """
diff --git a/cme/protocols/smb/db_navigator.py b/cme/protocols/smb/db_navigator.py
index e8fd751a..12782995 100644
--- a/cme/protocols/smb/db_navigator.py
+++ b/cme/protocols/smb/db_navigator.py
@@ -43,13 +43,17 @@ class navigator(DatabaseNavigator):
     #pull/545
     def display_hosts(self, hosts):
 
-        data = [['HostID', 'Admins', 'IP', 'Hostname', 'Domain', 'OS', 'SMBv1', 'Signing']]
+        data = [['HostID', 'Admins', 'IP', 'Hostname', 'Domain', 'OS', 'SMBv1', 'Signing', 'Spooler', 'Zerologon', 'PetitPotam']]
     
         for host in hosts:
             hostID = host[0]
             ip = host[1]
             hostname = host[2]
             domain = host[3]
+            spooler = host[5]
+            zerologon = host[6]
+            petitpotam = host[7]
+
             try:
                 os = host[4].decode()
             except:
@@ -58,7 +62,7 @@ class navigator(DatabaseNavigator):
                 smbv1 = host[6]
                 signing = host[7]
                 links = self.db.get_admin_relations(hostID=hostID)
-                data.append([hostID, str(len(links)) + ' Cred(s)', ip, hostname, domain, os, smbv1, signing])
+                data.append([hostID, str(len(links)) + ' Cred(s)', ip, hostname, domain, os, smbv1, signing, spooler, zerologon, petitpotam])
             except:
                 links = self.db.get_admin_relations(hostID=hostID)
                 data.append([hostID, str(len(links)) + ' Cred(s)', ip, hostname, domain, os])