diff --git a/volatility3/framework/plugins/windows/netscan.py b/volatility3/framework/plugins/windows/netscan.py
index 33b5a7fbc..16301bdd8 100644
--- a/volatility3/framework/plugins/windows/netscan.py
+++ b/volatility3/framework/plugins/windows/netscan.py
@@ -14,7 +14,7 @@ from volatility3.framework.symbols import intermed
 from volatility3.framework.symbols.windows import versions
 from volatility3.framework.symbols.windows.extensions import network
 from volatility3.plugins import timeliner
-from volatility3.plugins.windows import info, poolscanner
+from volatility3.plugins.windows import info, poolscanner, verinfo
 
 vollog = logging.getLogger(__name__)
 
@@ -34,6 +34,7 @@ class NetScan(interfaces.plugins.PluginInterface, timeliner.TimeLinerInterface):
                                             component = poolscanner.PoolScanner,
                                             version = (1, 0, 0)),
             requirements.VersionRequirement(name = 'info', component = info.Info, version = (1, 0, 0)),
+            requirements.VersionRequirement(name = 'verinfo', component = verinfo.VerInfo, version = (1, 0, 0)),
             requirements.BooleanRequirement(
                 name = 'include-corrupt',
                 description =
@@ -141,49 +142,55 @@ class NetScan(interfaces.plugins.PluginInterface, timeliner.TimeLinerInterface):
         # furthermore, it is easy to append new versions.
         if arch == "x86":
             version_dict = {
-                (6, 0, 6000): "netscan-vista-x86",
-                (6, 0, 6001): "netscan-vista-x86",
-                (6, 0, 6002): "netscan-vista-x86",
-                (6, 0, 6003): "netscan-vista-x86",
-                (6, 1, 7600): "netscan-win7-x86",
-                (6, 1, 7601): "netscan-win7-x86",
-                (6, 1, 8400): "netscan-win7-x86",
-                (6, 2, 9200): "netscan-win8-x86",
-                (6, 3, 9600): "netscan-win81-x86",
-                (10, 0, 10240): "netscan-win10-10240-x86",
-                (10, 0, 10586): "netscan-win10-10586-x86",
-                (10, 0, 14393): "netscan-win10-14393-x86",
-                (10, 0, 15063): "netscan-win10-15063-x86",
-                (10, 0, 16299): "netscan-win10-15063-x86",
-                (10, 0, 17134): "netscan-win10-17134-x86",
-                (10, 0, 17763): "netscan-win10-17134-x86",
-                (10, 0, 18362): "netscan-win10-17134-x86",
-                (10, 0, 18363): "netscan-win10-17134-x86"
+                (6, 0, 6000, 0): "netscan-vista-x86",
+                (6, 0, 6001, 0): "netscan-vista-x86",
+                (6, 0, 6002, 0): "netscan-vista-x86",
+                (6, 0, 6003, 0): "netscan-vista-x86",
+                (6, 1, 7600, 0): "netscan-win7-x86",
+                (6, 1, 7601, 0): "netscan-win7-x86",
+                (6, 1, 8400, 0): "netscan-win7-x86",
+                (6, 2, 9200, 0): "netscan-win8-x86",
+                (6, 3, 9600, 0): "netscan-win81-x86",
+                (10, 0, 10240, 0): "netscan-win10-10240-x86",
+                (10, 0, 10586, 0): "netscan-win10-10586-x86",
+                (10, 0, 14393, 0): "netscan-win10-14393-x86",
+                (10, 0, 15063, 0): "netscan-win10-15063-x86",
+                (10, 0, 16299, 0): "netscan-win10-15063-x86",
+                (10, 0, 17134, 0): "netscan-win10-17134-x86",
+                (10, 0, 17763, 0): "netscan-win10-17134-x86",
+                (10, 0, 18362, 0): "netscan-win10-17134-x86",
+                (10, 0, 18363, 0): "netscan-win10-17134-x86"
             }
         else:
             version_dict = {
-                (6, 0, 6000): "netscan-vista-x64",
-                (6, 0, 6001): "netscan-vista-sp12-x64",
-                (6, 0, 6002): "netscan-vista-sp12-x64",
-                (6, 0, 6003): "netscan-vista-sp12-x64",
-                (6, 1, 7600): "netscan-win7-x64",
-                (6, 1, 7601): "netscan-win7-x64",
-                (6, 1, 8400): "netscan-win7-x64",
-                (6, 2, 9200): "netscan-win8-x64",
-                (6, 3, 9600): "netscan-win81-x64",
-                (10, 0, 10240): "netscan-win10-x64",
-                (10, 0, 10586): "netscan-win10-x64",
-                (10, 0, 14393): "netscan-win10-x64",
-                (10, 0, 15063): "netscan-win10-15063-x64",
-                (10, 0, 16299): "netscan-win10-16299-x64",
-                (10, 0, 17134): "netscan-win10-17134-x64",
-                (10, 0, 17763): "netscan-win10-17763-x64",
-                (10, 0, 18362): "netscan-win10-18362-x64",
-                (10, 0, 18363): "netscan-win10-18363-x64",
-                (10, 0, 19041): "netscan-win10-19041-x64"
+                (6, 0, 6000, 0): "netscan-vista-x64",
+                (6, 0, 6001, 0): "netscan-vista-sp12-x64",
+                (6, 0, 6002, 0): "netscan-vista-sp12-x64",
+                (6, 0, 6003, 0): "netscan-vista-sp12-x64",
+                (6, 1, 7600, 0): "netscan-win7-x64",
+                (6, 1, 7601, 0): "netscan-win7-x64",
+                (6, 1, 8400, 0): "netscan-win7-x64",
+                (6, 2, 9200, 0): "netscan-win8-x64",
+                (6, 3, 9600, 0): "netscan-win81-x64",
+                (6, 3, 9600, 19935): "netscan-win81-19935-x64",
+                (10, 0, 10240, 0): "netscan-win10-x64",
+                (10, 0, 10586, 0): "netscan-win10-x64",
+                (10, 0, 14393, 0): "netscan-win10-x64",
+                (10, 0, 15063, 0): "netscan-win10-15063-x64",
+                (10, 0, 16299, 0): "netscan-win10-16299-x64",
+                (10, 0, 17134, 0): "netscan-win10-17134-x64",
+                (10, 0, 17763, 0): "netscan-win10-17763-x64",
+                (10, 0, 18362, 0): "netscan-win10-18362-x64",
+                (10, 0, 18363, 0): "netscan-win10-18363-x64",
+                (10, 0, 19041, 0): "netscan-win10-19041-x64"
             }
 
-        # special use case: Win10_18363 is not recognized by windows.info as 18363
+        # we do not need to check for tcpip's specific FileVersion in every case
+        tcpip_mod_version = 0 # keep it 0 as a default
+
+        # special use cases
+
+        # Win10_18363 is not recognized by windows.info as 18363
         # because all kernel file headers and debug structures report 18363 as
         # "10.0.18362.1198" with the last part being incremented. However, we can use
         # os_distinguisher to differentiate between 18362 and 18363
@@ -191,18 +198,36 @@ class NetScan(interfaces.plugins.PluginInterface, timeliner.TimeLinerInterface):
             vollog.debug("Detected 18363 data structures: working with 18363 symbol table.")
             vers_minor_version = 18363
 
+        # we need to define additional version numbers (which are then found via tcpip.sys's FileVersion header) in case there is
+        # ambiguity _within_ an OS version. If such a version number (last number of the tuple) is defined for the current OS
+        # we need to inspect tcpip.sys's headers to see if we can grab the precise version
+        if [ (a,b,c,d) for a, b, c, d in version_dict if (a,b,c) == (nt_major_version, nt_minor_version, vers_minor_version) and d != 0]:
+            vollog.debug("Requiring further version inspection due to OS version by checking tcpip.sys's FileVersion header")
+            # the following is IntelLayer specific and might need to be adapted to other architectures.
+            physical_layer_name = context.layers[layer_name].config.get('memory_layer', None)
+            if physical_layer_name:
+                ver = verinfo.VerInfo.find_version_info(context, physical_layer_name, "tcpip.sys")
+                if ver:
+                    tcpip_mod_version = ver[3]
+                    vollog.debug("Determined tcpip.sys's FileVersion: {}".format(tcpip_mod_version))
+                else:
+                    vollog.debug("Could not determine tcpip.sys's FileVersion.")
+            else:
+                vollog.debug("Unable to retrieve physical memory layer, skipping FileVersion check.")
+
         # when determining the symbol file we have to consider the following cases:
         # the determined version's symbol file is found by intermed.create -> proceed
         # the determined version's symbol file is not found by intermed -> intermed will throw an exc and abort
         # the determined version has no mapped symbol file -> if win10 use latest, otherwise throw exc
         # windows version cannot be determined -> throw exc
-        filename = version_dict.get((nt_major_version, nt_minor_version, vers_minor_version))
+
+        filename = version_dict.get((nt_major_version, nt_minor_version, vers_minor_version, tcpip_mod_version))
         if not filename:
             # no match on filename means that we possibly have a version newer than those listed here.
             # try to grab the latest supported version of the current image NT version. If that symbol
             # version does not work, support has to be added manually.
             current_versions = [
-                key for key in list(version_dict.keys()) if key[0] == nt_major_version and key[1] == nt_minor_version
+                (nt_maj, nt_min, vers_min, tcpip_ver) for nt_maj, nt_min, vers_min, tcpip_ver in version_dict if nt_maj == nt_major_version and nt_min == nt_minor_version and tcpip_ver <= tcpip_mod_version
             ]
             current_versions.sort()
 
@@ -210,7 +235,9 @@ class NetScan(interfaces.plugins.PluginInterface, timeliner.TimeLinerInterface):
                 latest_version = current_versions[-1]
 
                 filename = version_dict.get(latest_version)
+
                 vollog.debug(f"Unable to find exact matching symbol file, going with latest: {filename}")
+
             else:
                 raise NotImplementedError("This version of Windows is not supported: {}.{} {}.{}!".format(
                     nt_major_version, nt_minor_version, vers.MajorVersion, vers_minor_version))
diff --git a/volatility3/framework/plugins/windows/netstat.py b/volatility3/framework/plugins/windows/netstat.py
index e71683c10..486957565 100644
--- a/volatility3/framework/plugins/windows/netstat.py
+++ b/volatility3/framework/plugins/windows/netstat.py
@@ -12,7 +12,7 @@ from volatility3.framework.renderers import format_hints
 from volatility3.framework.symbols.windows import pdbutil
 from volatility3.framework.symbols.windows.extensions import network
 from volatility3.plugins import timeliner
-from volatility3.plugins.windows import netscan, modules
+from volatility3.plugins.windows import netscan, modules, info, verinfo
 
 vollog = logging.getLogger(__name__)
 
@@ -31,6 +31,8 @@ class NetStat(interfaces.plugins.PluginInterface, timeliner.TimeLinerInterface):
             requirements.VersionRequirement(name = 'netscan', component = netscan.NetScan, version = (1, 0, 0)),
             requirements.VersionRequirement(name = 'modules', component = modules.Modules, version = (1, 0, 0)),
             requirements.VersionRequirement(name = 'pdbutil', component = pdbutil.PDBUtility, version = (1, 0, 0)),
+            requirements.VersionRequirement(name = 'info', component = info.Info, version = (1, 0, 0)),
+            requirements.VersionRequirement(name = 'verinfo', component = verinfo.VerInfo, version = (1, 0, 0)),
             requirements.BooleanRequirement(
                 name = 'include-corrupt',
                 description =
diff --git a/volatility3/framework/plugins/windows/verinfo.py b/volatility3/framework/plugins/windows/verinfo.py
index 762832e39..70d473d2e 100644
--- a/volatility3/framework/plugins/windows/verinfo.py
+++ b/volatility3/framework/plugins/windows/verinfo.py
@@ -202,3 +202,4 @@ class VerInfo(interfaces.plugins.PluginInterface):
         return renderers.TreeGrid([("PID", int), ("Process", str), ("Base", format_hints.Hex), ("Name", str),
                                    ("Major", int), ("Minor", int), ("Product", int), ("Build", int)],
                                   self._generator(procs, mods, session_layers))
+
diff --git a/volatility3/framework/symbols/windows/netscan-win81-19935-x64.json b/volatility3/framework/symbols/windows/netscan-win81-19935-x64.json
new file mode 100644
index 000000000..f75428613
--- /dev/null
+++ b/volatility3/framework/symbols/windows/netscan-win81-19935-x64.json
@@ -0,0 +1,723 @@
+{
+    "base_types": {
+        "unsigned long": {
+            "kind": "int",
+            "size": 4,
+            "signed": false,
+            "endian": "little"
+        },
+        "unsigned char": {
+            "kind": "char",
+            "size": 1,
+            "signed": false,
+            "endian": "little"
+        },
+        "pointer": {
+            "kind": "int",
+            "size": 8,
+            "signed": false,
+            "endian": "little"
+        },
+        "unsigned int": {
+            "kind": "int",
+            "size": 4,
+            "signed": false,
+            "endian": "little"
+        },
+        "unsigned short": {
+            "kind": "int",
+            "size": 2,
+            "signed": false,
+            "endian": "little"
+        },
+        "unsigned be short": {
+            "kind": "int",
+            "size": 2,
+            "signed": false,
+            "endian": "big"
+        },
+        "long long": {
+          "endian": "little",
+          "kind": "int",
+          "signed": true,
+          "size": 8
+        },
+        "long": {
+            "kind": "int",
+            "size": 4,
+            "signed": false,
+            "endian": "little"
+        }
+    },
+  "symbols": {},
+  "user_types": {
+    "_TCP_SYN_ENDPOINT": {
+        "fields": {
+            "Owner": {
+                "offset": 64,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_SYN_OWNER"
+                    }
+                }
+            },
+            "CreateTime": {
+                "offset": 0,
+                "type": {
+                    "kind": "union",
+                    "name": "_LARGE_INTEGER"
+                }
+            },
+            "ListEntry": {
+                "offset": 16,
+                "type": {
+                    "kind": "union",
+                    "name": "nt_symbols!_LIST_ENTRY"
+                }
+            },
+            "InetAF": {
+                "offset": 48,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_INETAF"
+                    }
+
+                }
+            },
+            "LocalPort": {
+                "offset": 100,
+                "type": {
+                    "kind": "base",
+                    "name": "unsigned be short"
+                }
+            },
+            "RemotePort": {
+                "offset": 102,
+                "type": {
+                    "kind": "base",
+                    "name": "unsigned be short"
+                }
+            },
+            "LocalAddr": {
+                "offset": 56,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_LOCAL_ADDRESS"
+                    }
+                }
+            },
+            "RemoteAddress": {
+                "offset": 80,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_IN_ADDR"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 104
+    },
+    "_TCP_TIMEWAIT_ENDPOINT": {
+        "fields": {
+            "CreateTime": {
+                "offset": 0,
+                "type": {
+                    "kind": "union",
+                    "name": "_LARGE_INTEGER"
+                }
+            },
+            "ListEntry": {
+                "offset": 0,
+                "type": {
+                    "kind": "union",
+                    "name": "nt_symbols!_LIST_ENTRY"
+                }
+            },
+            "InetAF": {
+                "offset": 24,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_INETAF"
+                    }
+                }
+            },
+            "LocalPort": {
+                "offset": 48,
+                "type": {
+                    "kind": "base",
+                    "name": "unsigned be short"
+                }
+            },
+            "RemotePort": {
+                "offset": 50,
+                "type": {
+                    "kind": "base",
+                    "name": "unsigned be short"
+                }
+            },
+            "LocalAddr": {
+                "offset": 56,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_LOCAL_ADDRESS"
+                    }
+                }
+            },
+            "RemoteAddress": {
+                "offset": 64,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_IN_ADDR"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 72
+    },
+    "_UDP_ENDPOINT": {
+        "fields": {
+            "Owner": {
+                "offset": 40,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "nt_symbols!_EPROCESS"
+                    }
+
+                }
+            },
+            "CreateTime": {
+                "offset": 88,
+                "type": {
+                    "kind": "union",
+                    "name": "_LARGE_INTEGER"
+                }
+            },
+            "LocalAddr": {
+                "offset": 96,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_LOCAL_ADDRESS"
+                    }
+                }
+            },
+            "InetAF": {
+                "offset": 32,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_INETAF"
+                    }
+
+                }
+            },
+            "Port": {
+                "offset": 120,
+                "type": {
+                    "kind": "base",
+                    "name": "unsigned be short"
+                }
+            },
+            "Next": {
+                "offset": 112,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_UDP_ENDPOINT"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 130
+    },
+    "_TCP_LISTENER": {
+        "fields": {
+            "Owner": {
+                "offset": 40,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "nt_symbols!_EPROCESS"
+                    }
+
+                }
+            },
+            "CreateTime": {
+                "offset": 64,
+                "type": {
+                    "kind": "union",
+                    "name": "_LARGE_INTEGER"
+                }
+            },
+            "LocalAddr": {
+                "offset": 88,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_LOCAL_ADDRESS"
+                    }
+
+                }
+            },
+            "InetAF": {
+                "offset": 96,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_INETAF"
+                    }
+
+                }
+            },
+            "Port": {
+                "offset": 106,
+                "type": {
+                    "kind": "base",
+                    "name": "unsigned be short"
+                }
+            },
+            "Next": {
+                "offset": 112,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_TCP_LISTENER"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 108
+    },
+    "_TCP_ENDPOINT": {
+        "fields": {
+            "Owner": {
+                "offset": 608,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "nt_symbols!_EPROCESS"
+                    }
+
+                }
+            },
+            "CreateTime": {
+                "offset": 624,
+                "type": {
+                    "kind": "union",
+                    "name": "_LARGE_INTEGER"
+                }
+            },
+            "ListEntry": {
+                "offset": 40,
+                "type": {
+                    "kind": "union",
+                    "name": "nt_symbols!_LIST_ENTRY"
+                }
+            },
+            "AddrInfo": {
+                "offset": 24,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_ADDRINFO"
+                    }
+                }
+            },
+            "InetAF": {
+                "offset": 16,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_INETAF"
+                    }
+
+                }
+            },
+            "LocalPort": {
+                "offset": 112,
+                "type": {
+                    "kind": "base",
+                    "name": "unsigned be short"
+                }
+            },
+            "RemotePort": {
+                "offset": 114,
+                "type": {
+                    "kind": "base",
+                    "name": "unsigned be short"
+                }
+            },
+            "State": {
+                "offset": 108,
+                "type": {
+                    "kind": "enum",
+                    "name": "TCPStateEnum"
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 608
+    },
+    "_LOCAL_ADDRESS": {
+        "fields": {
+            "pData": {
+                "offset": 16,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "pointer",
+                        "subtype": {
+                            "kind": "struct",
+                            "name": "_IN_ADDR"
+                        }
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 24
+    },
+    "_ADDRINFO": {
+        "fields": {
+            "Local": {
+                "offset": 0,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_LOCAL_ADDRESS"
+                    }
+                }
+            },
+            "Remote": {
+                "offset": 16,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_IN_ADDR"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 24
+    },
+    "_IN_ADDR": {
+        "fields": {
+            "addr4": {
+                "offset": 0,
+                "type": {
+                    "count": 4,
+                    "subtype": {
+                        "kind": "base",
+                        "name": "unsigned char"
+                    },
+                    "kind": "array"
+                }
+            },
+            "addr6": {
+                "offset": 0,
+                "type": {
+                    "count": 16,
+                    "subtype": {
+                        "kind": "base",
+                        "name": "unsigned char"
+                    },
+                    "kind": "array"
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 6
+    },
+    "_INETAF": {
+        "fields": {
+            "AddressFamily": {
+                "offset": 24,
+                "type": {
+                    "kind": "base",
+                    "name": "unsigned short"
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 26
+    },
+    "_SYN_OWNER": {
+        "fields": {
+            "Process": {
+                "offset": 40,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "nt_symbols!_EPROCESS"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 48
+    },
+    "_LARGE_INTEGER": {
+      "fields": {
+        "HighPart": {
+          "offset": 4,
+          "type": {
+            "kind": "base",
+            "name": "long"
+          }
+        },
+        "LowPart": {
+          "offset": 0,
+          "type": {
+            "kind": "base",
+            "name": "unsigned long"
+          }
+        },
+        "QuadPart": {
+          "offset": 0,
+          "type": {
+            "kind": "base",
+            "name": "long long"
+          }
+        },
+        "u": {
+          "offset": 0,
+          "type": {
+            "kind": "struct",
+            "name": "__unnamed_2"
+          }
+        }
+      },
+      "kind": "union",
+      "size": 8
+    },
+    "_INET_COMPARTMENT_SET": {
+        "fields": {
+            "InetCompartment": {
+                "offset": 328,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_INET_COMPARTMENT"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 384
+    },
+    "_INET_COMPARTMENT": {
+        "fields": {
+            "ProtocolCompartment": {
+                "offset": 32,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_PROTOCOL_COMPARTMENT"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 48
+    },
+    "_PROTOCOL_COMPARTMENT": {
+        "fields": {
+            "PortPool": {
+                "offset": 0,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "struct",
+                      "name": "_INET_PORT_POOL"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 16
+    },
+    "_PORT_ASSIGNMENT_ENTRY": {
+        "fields": {
+            "Entry": {
+                "offset": 8,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "base",
+                      "name": "void"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 24
+    },
+    "_PORT_ASSIGNMENT_LIST": {
+        "fields": {
+            "Assignments": {
+                "offset": 0,
+                "type": {
+                    "count": 256,
+                    "kind": "array",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_PORT_ASSIGNMENT_ENTRY"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 6144
+    },
+    "_PORT_ASSIGNMENT": {
+        "fields": {
+            "InPaBigPoolBase": {
+                "offset": 24,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "struct",
+                      "name": "_PORT_ASSIGNMENT_LIST"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 32
+    },
+    "_INET_PORT_POOL": {
+        "fields": {
+            "PortAssignments": {
+                "offset": 216,
+                "type": {
+                    "count": 256,
+                    "kind": "array",
+                    "subtype": {
+                        "kind": "pointer",
+                        "subtype": {
+                          "kind": "struct",
+                          "name": "_PORT_ASSIGNMENT"
+                        }
+                    }
+                }
+            },
+            "PortBitMap": {
+                "offset": 200,
+                "type": {
+                    "kind": "struct",
+                    "name": "nt_symbols!_RTL_BITMAP"
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 11200
+    },
+    "_PARTITION": {
+        "fields": {
+            "Endpoints" : {
+                "offset": 8,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "struct",
+                      "name": "nt_symbols!_RTL_DYNAMIC_HASH_TABLE"
+                    }
+                }
+            },
+            "UnknownHashTable" : {
+                "offset": 16,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "struct",
+                      "name": "nt_symbols!_RTL_DYNAMIC_HASH_TABLE"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 128
+    },
+    "_PARTITION_TABLE": {
+        "fields": {
+            "Partitions": {
+                "offset": 0,
+                "type": {
+                    "count": 1,
+                    "kind": "array",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_PARTITION"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 128
+    }
+  },
+  "enums": {
+    "TCPStateEnum": {
+        "base": "long",
+        "constants": {
+            "CLOSED": 0,
+            "LISTENING": 1,
+            "SYN_SENT": 2,
+            "SYN_RCVD": 3,
+            "ESTABLISHED": 4,
+            "FIN_WAIT1": 5,
+            "FIN_WAIT2": 6,
+            "CLOSE_WAIT": 7,
+            "CLOSING": 8,
+            "LAST_ACK": 9,
+            "TIME_WAIT": 12,
+            "DELETE_TCB": 13
+        },
+        "size": 4
+    }
+  },
+  "metadata": {
+    "producer": {
+      "version": "0.0.1",
+      "name": "japhlange-by-hand",
+      "datetime": "2020-06-12T14:00:00"
+    },
+    "format": "6.0.0"
+  }
+}
diff --git a/volatility3/framework/symbols/windows/netscan/netscan-win8-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-win8-x64.json
index 993c6a129..24873b078 100644
--- a/volatility3/framework/symbols/windows/netscan/netscan-win8-x64.json
+++ b/volatility3/framework/symbols/windows/netscan/netscan-win8-x64.json
@@ -237,6 +237,16 @@
                     "kind": "base",
                     "name": "unsigned be short"
                 }
+            },
+            "Next": {
+                "offset": 136,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_UDP_ENDPOINT"
+                    }
+                }
             }
         },
         "kind": "struct",
@@ -256,7 +266,7 @@
                 }
             },
             "CreateTime": {
-                "offset": 32,
+                "offset": 64,
                 "type": {
                     "kind": "union",
                     "name": "_LARGE_INTEGER"
@@ -290,6 +300,16 @@
                     "kind": "base",
                     "name": "unsigned be short"
                 }
+            },
+            "Next": {
+                "offset": 112,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_TCP_LISTENER"
+                    }
+                }
             }
         },
         "kind": "struct",
@@ -503,6 +523,173 @@
       },
       "kind": "union",
       "size": 8
+    },
+    "_INET_COMPARTMENT_SET": {
+        "fields": {
+            "InetCompartment": {
+                "offset": 328,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_INET_COMPARTMENT"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 384
+    },
+    "_INET_COMPARTMENT": {
+        "fields": {
+            "ProtocolCompartment": {
+                "offset": 32,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_PROTOCOL_COMPARTMENT"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 48
+    },
+    "_PROTOCOL_COMPARTMENT": {
+        "fields": {
+            "PortPool": {
+                "offset": 0,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "struct",
+                      "name": "_INET_PORT_POOL"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 16
+    },
+    "_PORT_ASSIGNMENT_ENTRY": {
+        "fields": {
+            "Entry": {
+                "offset": 8,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "base",
+                      "name": "void"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 16
+    },
+    "_PORT_ASSIGNMENT_LIST": {
+        "fields": {
+            "Assignments": {
+                "offset": 0,
+                "type": {
+                    "count": 256,
+                    "kind": "array",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_PORT_ASSIGNMENT_ENTRY"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 4096
+    },
+    "_PORT_ASSIGNMENT": {
+        "fields": {
+            "InPaBigPoolBase": {
+                "offset": 32,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "struct",
+                      "name": "_PORT_ASSIGNMENT_LIST"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 40
+    },
+    "_INET_PORT_POOL": {
+        "fields": {
+            "PortAssignments": {
+                "offset": 176,
+                "type": {
+                    "count": 256,
+                    "kind": "array",
+                    "subtype": {
+                        "kind": "pointer",
+                        "subtype": {
+                          "kind": "struct",
+                          "name": "_PORT_ASSIGNMENT"
+                        }
+                    }
+                }
+            },
+            "PortBitMap": {
+                "offset": 160,
+                "type": {
+                    "kind": "struct",
+                    "name": "nt_symbols!_RTL_BITMAP"
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 11200
+    },
+    "_PARTITION": {
+        "fields": {
+            "Endpoints" : {
+                "offset": 8,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "struct",
+                      "name": "nt_symbols!_RTL_DYNAMIC_HASH_TABLE"
+                    }
+                }
+            },
+            "UnknownHashTable" : {
+                "offset": 16,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "struct",
+                      "name": "nt_symbols!_RTL_DYNAMIC_HASH_TABLE"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 128
+    },
+    "_PARTITION_TABLE": {
+        "fields": {
+            "Partitions": {
+                "offset": 0,
+                "type": {
+                    "count": 1,
+                    "kind": "array",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_PARTITION"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 128
     }
   },
   "enums": {
diff --git a/volatility3/framework/symbols/windows/netscan/netscan-win81-x64.json b/volatility3/framework/symbols/windows/netscan/netscan-win81-x64.json
index 80bea7838..d6c51d2db 100644
--- a/volatility3/framework/symbols/windows/netscan/netscan-win81-x64.json
+++ b/volatility3/framework/symbols/windows/netscan/netscan-win81-x64.json
@@ -232,11 +232,21 @@
                 }
             },
             "Port": {
-                "offset": 128,
+                "offset": 120,
                 "type": {
                     "kind": "base",
                     "name": "unsigned be short"
                 }
+            },
+            "Next": {
+                "offset": 112,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_UDP_ENDPOINT"
+                    }
+                }
             }
         },
         "kind": "struct",
@@ -256,7 +266,7 @@
                 }
             },
             "CreateTime": {
-                "offset": 32,
+                "offset": 64,
                 "type": {
                     "kind": "union",
                     "name": "_LARGE_INTEGER"
@@ -290,6 +300,16 @@
                     "kind": "base",
                     "name": "unsigned be short"
                 }
+            },
+            "Next": {
+                "offset": 112,
+                "type":{
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_TCP_LISTENER"
+                    }
+                }
             }
         },
         "kind": "struct",
@@ -503,6 +523,173 @@
       },
       "kind": "union",
       "size": 8
+    },
+    "_INET_COMPARTMENT_SET": {
+        "fields": {
+            "InetCompartment": {
+                "offset": 328,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_INET_COMPARTMENT"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 384
+    },
+    "_INET_COMPARTMENT": {
+        "fields": {
+            "ProtocolCompartment": {
+                "offset": 32,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_PROTOCOL_COMPARTMENT"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 48
+    },
+    "_PROTOCOL_COMPARTMENT": {
+        "fields": {
+            "PortPool": {
+                "offset": 0,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "struct",
+                      "name": "_INET_PORT_POOL"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 16
+    },
+    "_PORT_ASSIGNMENT_ENTRY": {
+        "fields": {
+            "Entry": {
+                "offset": 8,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "base",
+                      "name": "void"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 24
+    },
+    "_PORT_ASSIGNMENT_LIST": {
+        "fields": {
+            "Assignments": {
+                "offset": 0,
+                "type": {
+                    "count": 256,
+                    "kind": "array",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_PORT_ASSIGNMENT_ENTRY"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 6144
+    },
+    "_PORT_ASSIGNMENT": {
+        "fields": {
+            "InPaBigPoolBase": {
+                "offset": 32,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "struct",
+                      "name": "_PORT_ASSIGNMENT_LIST"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 40
+    },
+    "_INET_PORT_POOL": {
+        "fields": {
+            "PortAssignments": {
+                "offset": 176,
+                "type": {
+                    "count": 256,
+                    "kind": "array",
+                    "subtype": {
+                        "kind": "pointer",
+                        "subtype": {
+                          "kind": "struct",
+                          "name": "_PORT_ASSIGNMENT"
+                        }
+                    }
+                }
+            },
+            "PortBitMap": {
+                "offset": 160,
+                "type": {
+                    "kind": "struct",
+                    "name": "nt_symbols!_RTL_BITMAP"
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 11200
+    },
+    "_PARTITION": {
+        "fields": {
+            "Endpoints" : {
+                "offset": 8,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "struct",
+                      "name": "nt_symbols!_RTL_DYNAMIC_HASH_TABLE"
+                    }
+                }
+            },
+            "UnknownHashTable" : {
+                "offset": 16,
+                "type": {
+                    "kind": "pointer",
+                    "subtype": {
+                      "kind": "struct",
+                      "name": "nt_symbols!_RTL_DYNAMIC_HASH_TABLE"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 128
+    },
+    "_PARTITION_TABLE": {
+        "fields": {
+            "Partitions": {
+                "offset": 0,
+                "type": {
+                    "count": 1,
+                    "kind": "array",
+                    "subtype": {
+                        "kind": "struct",
+                        "name": "_PARTITION"
+                    }
+                }
+            }
+        },
+        "kind": "struct",
+        "size": 128
     }
   },
   "enums": {