diff --git a/.github/schema/schema.yml b/.github/schema/schema.yml
index 461275a..4340e37 100644
--- a/.github/schema/schema.yml
+++ b/.github/schema/schema.yml
@@ -155,10 +155,13 @@ mapping:
         func: not_empty
         required: true
         mapping:
-          Name:
+          Name: &Individual
             type: str
             pattern: '^\w[\w\s\-'']+\w$'
             required: true
+          Company:
+            type: str
+            required: false
           Twitter:
             type: str
             pattern: '^@(\w){1,15}$'
diff --git a/yml/3rd_party/adobe/sqlite.yml b/yml/3rd_party/adobe/sqlite.yml
index 425eec3..767ad57 100644
--- a/yml/3rd_party/adobe/sqlite.yml
+++ b/yml/3rd_party/adobe/sqlite.yml
@@ -12,10 +12,8 @@ VulnerableExecutables:
       - 1f64f01063b26bf05d4b076d54816e54dacd08b7fd6e5bc9cc5d11a548ff2215
 Resources:
   - https://asec.ahnlab.com/en/58319/
-  - https://www.virustotal.com/gui/file/1f64f01063b26bf05d4b076d54816e54dacd08b7fd6e5bc9cc5d11a548ff2215
   - https://www.virustotal.com/gui/file/802bad293e5d5e75ffac3df3dd5301315a886534011871275a1b41c9cec1f298
 Acknowledgements:
   - Name: Jai Minton
+    Company: Huntress
     Twitter: '@cyberrraiju'
-  - Name: Huntress
-    Twitter: '@HuntressLabs'
diff --git a/yml/3rd_party/flexera/fnp_act_installer.yml b/yml/3rd_party/flexera/fnp_act_installer.yml
index 17180ae..f9b24fc 100644
--- a/yml/3rd_party/flexera/fnp_act_installer.yml
+++ b/yml/3rd_party/flexera/fnp_act_installer.yml
@@ -14,10 +14,8 @@ VulnerableExecutables:
       - 'b5f9377bd27fcf48fb3d81d0196021681739f42a198e8340c27d55192d4bd3ac'
 Resources:
   - https://asec.ahnlab.com/en/58319/
-  - https://www.virustotal.com/gui/file/b5f9377bd27fcf48fb3d81d0196021681739f42a198e8340c27d55192d4bd3ac
   - https://www.virustotal.com/gui/file/e7b69768215453b2c648d7060161ce9b9eaf1ace631eb2ac11b60a7195e2263e
 Acknowledgements:
   - Name: Jai Minton
+    Company: Huntress
     Twitter: '@cyberrraiju'
-  - Name: Huntress
-    Twitter: '@HuntressLabs'
diff --git a/yml/3rd_party/oracle/qtcorevbox4.yml b/yml/3rd_party/oracle/qtcorevbox4.yml
index beb3b15..b7e2fd7 100644
--- a/yml/3rd_party/oracle/qtcorevbox4.yml
+++ b/yml/3rd_party/oracle/qtcorevbox4.yml
@@ -16,6 +16,5 @@ Resources:
   - https://www.virustotal.com/gui/file/a6e6b1a47021fa1e4d36b047f5326eb04d5f545907fc6ac3730162a07cc792ff
 Acknowledgements:
   - Name: Jai Minton
+    Company: Huntress
     Twitter: '@cyberrraiju'
-  - Name: Huntress
-    Twitter: '@HuntressLabs'
diff --git a/yml/3rd_party/oracle/vboxrt.yml b/yml/3rd_party/oracle/vboxrt.yml
index 9e8a877..de1582a 100644
--- a/yml/3rd_party/oracle/vboxrt.yml
+++ b/yml/3rd_party/oracle/vboxrt.yml
@@ -17,6 +17,5 @@ Resources:
   - https://www.virustotal.com/gui/file/cf801023465679ec34084bdb1adb9f54b2fc3130925a4b8fdc10b11639b4a7cd
 Acknowledgements:
   - Name: Jai Minton
+    Company: Huntress
     Twitter: '@cyberrraiju'
-  - Name: Huntress
-    Twitter: '@HuntressLabs'
diff --git a/yml/3rd_party/pspad/libeay32.yml b/yml/3rd_party/pspad/libeay32.yml
index d887136..763d922 100644
--- a/yml/3rd_party/pspad/libeay32.yml
+++ b/yml/3rd_party/pspad/libeay32.yml
@@ -19,6 +19,5 @@ Resources:
   - https://www.virustotal.com/gui/file/a13c09f41979df8717a9d39e15e6ce960c1c4ba6af456a563fa3ff1b8b4d388c
 Acknowledgements:
   - Name: Jai Minton
+    Company: Huntress
     Twitter: '@cyberrraiju'
-  - Name: Huntress
-    Twitter: '@HuntressLabs'
diff --git a/yml/3rd_party/thinprint/tpsvc.yml b/yml/3rd_party/thinprint/tpsvc.yml
index 04603ca..6c5562a 100644
--- a/yml/3rd_party/thinprint/tpsvc.yml
+++ b/yml/3rd_party/thinprint/tpsvc.yml
@@ -7,11 +7,7 @@ ExpectedLocations:
   - '%PROGRAMFILES%\VMWare\VMWare Tools'
   - '%PROGRAMFILES%\Common Files\ThinPrint'
 VulnerableExecutables:
-  - Path: '%PROGRAMFILES%\VMWare\VMWare Tools\TPAutoConnect.exe'
-    Type: Sideloading
-    SHA256:
-      - 'e631bf67c349ce3afc7d5960b0247af9466292bc314ff393dee0716f3a50fd5f'
-  - Path: '%PROGRAMFILES%\Common Files\ThinPrint\TPAutoConnect.exe'
+  - Path: 'TPAutoConnect.exe'
     Type: Sideloading
     SHA256:
       - 'e631bf67c349ce3afc7d5960b0247af9466292bc314ff393dee0716f3a50fd5f'
@@ -21,6 +17,5 @@ Resources:
   - https://www.virustotal.com/gui/file/a6e6b1a47021fa1e4d36b047f5326eb04d5f545907fc6ac3730162a07cc792ff
 Acknowledgements:
   - Name: Jai Minton
+    Company: Huntress
     Twitter: '@cyberrraiju'
-  - Name: Huntress
-    Twitter: '@HuntressLabs'
diff --git a/yml/3rd_party/vlc/libvlccore.yml b/yml/3rd_party/vlc/libvlccore.yml
index bba2b27..9f02384 100644
--- a/yml/3rd_party/vlc/libvlccore.yml
+++ b/yml/3rd_party/vlc/libvlccore.yml
@@ -15,6 +15,5 @@ Resources:
   - https://www.virustotal.com/gui/file/33c08eeaff6e9aa686a14144cb84d1895f260d28b767a0d2a10dbe427a65d7c0
 Acknowledgements:
   - Name: Jai Minton
+    Company: Huntress
     Twitter: '@cyberrraiju'
-  - Name: Huntress
-    Twitter: '@HuntressLabs'
diff --git a/yml/3rd_party/wireshark/libglib-2.0-0.yml b/yml/3rd_party/wireshark/libglib-2.0-0.yml
index 0ec26b1..53db9e5 100644
--- a/yml/3rd_party/wireshark/libglib-2.0-0.yml
+++ b/yml/3rd_party/wireshark/libglib-2.0-0.yml
@@ -17,6 +17,5 @@ Resources:
   - https://www.virustotal.com/gui/file/fcb0272d586fff854ce9b329fbbba26902984a112a1afe96a149dbb2011ad289
 Acknowledgements:
   - Name: Jai Minton
+    Company: Huntress
     Twitter: '@cyberrraiju'
-  - Name: Huntress
-    Twitter: '@HuntressLabs'
diff --git a/yml/3rd_party/wireshark/libwsutil.yml b/yml/3rd_party/wireshark/libwsutil.yml
index 31c93e6..d7fda73 100644
--- a/yml/3rd_party/wireshark/libwsutil.yml
+++ b/yml/3rd_party/wireshark/libwsutil.yml
@@ -18,6 +18,5 @@ Resources:
   - https://www.virustotal.com/gui/file/e91c4f990c1b0b58d69f3c3e80916463e5cc87011fd418d610c5264f7d5ecc9b
 Acknowledgements:
   - Name: Jai Minton
+    Company: Huntress
     Twitter: '@cyberrraiju'
-  - Name: Huntress
-    Twitter: '@HuntressLabs'
diff --git a/yml/microsoft/external/mpgear.yml b/yml/microsoft/external/mpgear.yml
index dc1feac..5b8fe2c 100644
--- a/yml/microsoft/external/mpgear.yml
+++ b/yml/microsoft/external/mpgear.yml
@@ -12,11 +12,9 @@ VulnerableExecutables:
       - '8dc4d5deef19fb4da195c270819a6ee283b67408fc9ee187216a0ce80ee61bab'
 Resources:
   - https://asec.ahnlab.com/en/58319/
-  - https://www.virustotal.com/gui/file/8dc4d5deef19fb4da195c270819a6ee283b67408fc9ee187216a0ce80ee61bab
   - https://www.virustotal.com/gui/file/1643a9c54e5d730fb0ebf4ab49e6c1d3a09dcd2c3a0282674330346d90990ab0
   - https://www.virustotal.com/gui/file/e1316301e7904a415fdd2a1707d1a48220cce055aab17b36a48e67bf0369edba
 Acknowledgements:
   - Name: Jai Minton
+    Company: Huntress
     Twitter: '@cyberrraiju'
-  - Name: Huntress
-    Twitter: '@HuntressLabs'
diff --git a/yml/microsoft/external/tedutil.yml b/yml/microsoft/external/tedutil.yml
index 7926188..44a4f6d 100644
--- a/yml/microsoft/external/tedutil.yml
+++ b/yml/microsoft/external/tedutil.yml
@@ -12,11 +12,9 @@ VulnerableExecutables:
       - 'b874e5abdd7c008d47560fda4e84db893ac63c18c3a5a450d25f4e62ed8e8d8c'
 Resources:
   - https://asec.ahnlab.com/en/58319/
-  - https://www.virustotal.com/gui/file/b874e5abdd7c008d47560fda4e84db893ac63c18c3a5a450d25f4e62ed8e8d8c
   - https://www.virustotal.com/gui/file/eb014e37fdcaf42c93f606058896ccb47eed56be5e1701c7b9744bac0003a8e8/details
   - https://learn.microsoft.com/en-us/windows/win32/medfound/topoedit-modules
 Acknowledgements:
   - Name: Jai Minton
+    Company: Huntress
     Twitter: '@cyberrraiju'
-  - Name: Huntress
-    Twitter: '@HuntressLabs'