diff --git a/BinaryObjectScanner/Data/StaticChecks.cs b/BinaryObjectScanner/Data/StaticChecks.cs
new file mode 100644
index 00000000..1b7f0af9
--- /dev/null
+++ b/BinaryObjectScanner/Data/StaticChecks.cs
@@ -0,0 +1,119 @@
+using System.Collections.Generic;
+using BinaryObjectScanner.Interfaces;
+using SabreTools.Serialization.Wrappers;
+
+namespace BinaryObjectScanner.Data
+{
+    internal static class StaticChecks
+    {
+        #region Public Collections
+
+        /// <summary>
+        /// Cache for all IContentCheck types
+        /// </summary>
+        public static List<IContentCheck> ContentCheckClasses
+        {
+            get
+            {
+                contentCheckClasses ??= Factory.InitCheckClasses<IContentCheck>();
+                return contentCheckClasses ?? [];
+            }
+        }
+
+        /// <summary>
+        /// Cache for all IExecutableCheck<LinearExecutable> types
+        /// </summary>
+        public static List<IExecutableCheck<LinearExecutable>> LinearExecutableCheckClasses
+        {
+            get
+            {
+                linearExecutableCheckClasses ??= Factory.InitCheckClasses<IExecutableCheck<LinearExecutable>>();
+                return linearExecutableCheckClasses ?? [];
+            }
+        }
+
+        /// <summary>
+        /// Cache for all IExecutableCheck<MSDOS> types
+        /// </summary>
+        public static List<IExecutableCheck<MSDOS>> MSDOSExecutableCheckClasses
+        {
+            get
+            {
+                msdosExecutableCheckClasses ??= Factory.InitCheckClasses<IExecutableCheck<MSDOS>>();
+                return msdosExecutableCheckClasses ?? [];
+            }
+        }
+
+        /// <summary>
+        /// Cache for all IExecutableCheck<NewExecutable> types
+        /// </summary>
+        public static List<IExecutableCheck<NewExecutable>> NewExecutableCheckClasses
+        {
+            get
+            {
+                newExecutableCheckClasses ??= Factory.InitCheckClasses<IExecutableCheck<NewExecutable>>();
+                return newExecutableCheckClasses ?? [];
+            }
+        }
+
+        /// <summary>
+        /// Cache for all IPathCheck types
+        /// </summary>
+        public static List<IPathCheck> PathCheckClasses
+        {
+            get
+            {
+                pathCheckClasses ??= Factory.InitCheckClasses<IPathCheck>();
+                return pathCheckClasses ?? [];
+            }
+        }
+
+        /// <summary>
+        /// Cache for all IExecutableCheck<PortableExecutable> types
+        /// </summary>
+        public static List<IExecutableCheck<PortableExecutable>> PortableExecutableCheckClasses
+        {
+            get
+            {
+                portableExecutableCheckClasses ??= Factory.InitCheckClasses<IExecutableCheck<PortableExecutable>>();
+                return portableExecutableCheckClasses ?? [];
+            }
+        }
+
+        #endregion
+
+        #region Internal Instances
+
+        /// <summary>
+        /// Cache for all IContentCheck types
+        /// </summary>
+        private static List<IContentCheck>? contentCheckClasses;
+
+        /// <summary>
+        /// Cache for all IExecutableCheck<LinearExecutable> types
+        /// </summary>
+        private static List<IExecutableCheck<LinearExecutable>>? linearExecutableCheckClasses;
+
+        /// <summary>
+        /// Cache for all IExecutableCheck<MSDOS> types
+        /// </summary>
+        private static List<IExecutableCheck<MSDOS>>? msdosExecutableCheckClasses;
+
+        /// <summary>
+        /// Cache for all IExecutableCheck<NewExecutable> types
+        /// </summary>
+        private static List<IExecutableCheck<NewExecutable>>? newExecutableCheckClasses;
+
+        /// <summary>
+        /// Cache for all IPathCheck types
+        /// </summary>
+        private static List<IPathCheck>? pathCheckClasses;
+
+        /// <summary>
+        /// Cache for all IExecutableCheck<PortableExecutable> types
+        /// </summary>
+        private static List<IExecutableCheck<PortableExecutable>>? portableExecutableCheckClasses;
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/BinaryObjectScanner/FileType/Executable.cs b/BinaryObjectScanner/FileType/Executable.cs
index b9ceba46..faca897c 100644
--- a/BinaryObjectScanner/FileType/Executable.cs
+++ b/BinaryObjectScanner/FileType/Executable.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using BinaryObjectScanner.Data;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.IO.Extensions;
 using SabreTools.Serialization.Wrappers;
@@ -28,95 +29,6 @@ namespace BinaryObjectScanner.FileType
         /// </summary>
         public bool IncludePackers { get; set; }
 
-        /// <summary>
-        /// Cache for all IContentCheck types
-        /// </summary>
-        public static List<IContentCheck> ContentCheckClasses
-        {
-            get
-            {
-                contentCheckClasses ??= Factory.InitCheckClasses<IContentCheck>();
-                return contentCheckClasses ?? [];
-            }
-        }
-
-        /// <summary>
-        /// Cache for all IExecutableCheck<LinearExecutable> types
-        /// </summary>
-        public static List<IExecutableCheck<LinearExecutable>> LinearExecutableCheckClasses
-        {
-            get
-            {
-                linearExecutableCheckClasses ??= Factory.InitCheckClasses<IExecutableCheck<LinearExecutable>>();
-                return linearExecutableCheckClasses ?? [];
-            }
-        }
-
-        /// <summary>
-        /// Cache for all IExecutableCheck<MSDOS> types
-        /// </summary>
-        public static List<IExecutableCheck<MSDOS>> MSDOSExecutableCheckClasses
-        {
-            get
-            {
-                msdosExecutableCheckClasses ??= Factory.InitCheckClasses<IExecutableCheck<MSDOS>>();
-                return msdosExecutableCheckClasses ?? [];
-            }
-        }
-
-        /// <summary>
-        /// Cache for all IExecutableCheck<NewExecutable> types
-        /// </summary>
-        public static List<IExecutableCheck<NewExecutable>> NewExecutableCheckClasses
-        {
-            get
-            {
-                newExecutableCheckClasses ??= Factory.InitCheckClasses<IExecutableCheck<NewExecutable>>();
-                return newExecutableCheckClasses ?? [];
-            }
-        }
-
-        /// <summary>
-        /// Cache for all IExecutableCheck<PortableExecutable> types
-        /// </summary>
-        public static List<IExecutableCheck<PortableExecutable>> PortableExecutableCheckClasses
-        {
-            get
-            {
-                portableExecutableCheckClasses ??= Factory.InitCheckClasses<IExecutableCheck<PortableExecutable>>();
-                return portableExecutableCheckClasses ?? [];
-            }
-        }
-
-        #endregion
-
-        #region Internal Instances
-
-        /// <summary>
-        /// Cache for all IContentCheck types
-        /// </summary>
-        private static List<IContentCheck>? contentCheckClasses;
-
-        /// <summary>
-        /// Cache for all IExecutableCheck<LinearExecutable> types
-        /// </summary>
-        private static List<IExecutableCheck<LinearExecutable>>? linearExecutableCheckClasses;
-
-        /// <summary>
-        /// Cache for all IExecutableCheck<MSDOS> types
-        /// </summary>
-        private static List<IExecutableCheck<MSDOS>>? msdosExecutableCheckClasses;
-
-        /// <summary>
-        /// Cache for all IExecutableCheck<NewExecutable> types
-        /// </summary>
-        private static List<IExecutableCheck<NewExecutable>>? newExecutableCheckClasses;
-
-        /// <summary>
-        /// Cache for all IExecutableCheck<PortableExecutable> types
-        /// </summary>
-        private static List<IExecutableCheck<PortableExecutable>>? portableExecutableCheckClasses;
-
         #endregion
 
         /// <inheritdoc/>
@@ -149,22 +61,22 @@ namespace BinaryObjectScanner.FileType
 
             if (wrapper is MSDOS mz)
             {
-                var subProtections = RunExecutableChecks(file, mz, MSDOSExecutableCheckClasses, includeDebug);
+                var subProtections = RunExecutableChecks(file, mz, StaticChecks.MSDOSExecutableCheckClasses, includeDebug);
                 protections.AddRange(subProtections.Values);
             }
             else if (wrapper is LinearExecutable lex)
             {
-                var subProtections = RunExecutableChecks(file, lex, LinearExecutableCheckClasses, includeDebug);
+                var subProtections = RunExecutableChecks(file, lex, StaticChecks.LinearExecutableCheckClasses, includeDebug);
                 protections.AddRange(subProtections.Values);
             }
             else if (wrapper is NewExecutable nex)
             {
-                var subProtections = RunExecutableChecks(file, nex, NewExecutableCheckClasses, includeDebug);
+                var subProtections = RunExecutableChecks(file, nex, StaticChecks.NewExecutableCheckClasses, includeDebug);
                 protections.AddRange(subProtections.Values);
             }
             else if (wrapper is PortableExecutable pex)
             {
-                var subProtections = RunExecutableChecks(file, pex, PortableExecutableCheckClasses, includeDebug);
+                var subProtections = RunExecutableChecks(file, pex, StaticChecks.PortableExecutableCheckClasses, includeDebug);
                 protections.AddRange(subProtections.Values);
             }
 
@@ -206,7 +118,7 @@ namespace BinaryObjectScanner.FileType
             }
 
             // Iterate through all checks
-            ContentCheckClasses.IterateWithAction(checkClass =>
+            StaticChecks.ContentCheckClasses.IterateWithAction(checkClass =>
             {
                 // Get the protection for the class, if possible
                 var protection = checkClass.CheckContents(file!, fileContent, includeDebug);
diff --git a/BinaryObjectScanner/Handler.cs b/BinaryObjectScanner/Handler.cs
index 6b81803a..c00549fb 100644
--- a/BinaryObjectScanner/Handler.cs
+++ b/BinaryObjectScanner/Handler.cs
@@ -1,37 +1,13 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using BinaryObjectScanner.Data;
 using BinaryObjectScanner.Interfaces;
 
 namespace BinaryObjectScanner
 {
     internal static class Handler
     {
-        #region Public Collections
-
-        /// <summary>
-        /// Cache for all IPathCheck types
-        /// </summary>
-        public static List<IPathCheck> PathCheckClasses
-        {
-            get
-            {
-                pathCheckClasses ??= Factory.InitCheckClasses<IPathCheck>();
-                return pathCheckClasses ?? [];
-            }
-        }
-
-        #endregion
-
-        #region Internal Instances
-
-        /// <summary>
-        /// Cache for all IPathCheck types
-        /// </summary>
-        private static List<IPathCheck>? pathCheckClasses;
-
-        #endregion
-
         #region Multiple Implementation Wrappers
 
         /// <summary>
@@ -49,7 +25,7 @@ namespace BinaryObjectScanner
             files = files?.Select(f => f.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar))?.ToList();
 
             // Iterate through all checks
-            PathCheckClasses.IterateWithAction(checkClass =>
+            StaticChecks.PathCheckClasses.IterateWithAction(checkClass =>
             {
                 var subProtections = checkClass?.PerformCheck(path, files);
                 if (subProtections != null)
diff --git a/BinaryObjectScanner/Scanner.cs b/BinaryObjectScanner/Scanner.cs
index c9b537f9..c5288265 100644
--- a/BinaryObjectScanner/Scanner.cs
+++ b/BinaryObjectScanner/Scanner.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using BinaryObjectScanner.Data;
 using BinaryObjectScanner.FileType;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.IO.Extensions;
@@ -403,7 +404,7 @@ namespace BinaryObjectScanner
             if (wrapper is MSDOS mz)
             {
                 // Standard checks
-                var subProtections = executable.RunExecutableChecks(fileName, mz, Executable.MSDOSExecutableCheckClasses, _options.IncludeDebug);
+                var subProtections = executable.RunExecutableChecks(fileName, mz, StaticChecks.MSDOSExecutableCheckClasses, _options.IncludeDebug);
                 protections.Append(fileName, subProtections.Values);
 
                 // Extractable checks
@@ -413,7 +414,7 @@ namespace BinaryObjectScanner
             else if (wrapper is LinearExecutable lex)
             {
                 // Standard checks
-                var subProtections = executable.RunExecutableChecks(fileName, lex, Executable.LinearExecutableCheckClasses, _options.IncludeDebug);
+                var subProtections = executable.RunExecutableChecks(fileName, lex, StaticChecks.LinearExecutableCheckClasses, _options.IncludeDebug);
                 protections.Append(fileName, subProtections.Values);
 
                 // Extractable checks
@@ -423,7 +424,7 @@ namespace BinaryObjectScanner
             else if (wrapper is NewExecutable nex)
             {
                 // Standard checks
-                var subProtections = executable.RunExecutableChecks(fileName, nex, Executable.NewExecutableCheckClasses, _options.IncludeDebug);
+                var subProtections = executable.RunExecutableChecks(fileName, nex, StaticChecks.NewExecutableCheckClasses, _options.IncludeDebug);
                 protections.Append(fileName, subProtections.Values);
 
                 // Extractable checks
@@ -433,7 +434,7 @@ namespace BinaryObjectScanner
             else if (wrapper is PortableExecutable pex)
             {
                 // Standard checks
-                var subProtections = executable.RunExecutableChecks(fileName, pex, Executable.PortableExecutableCheckClasses, _options.IncludeDebug);
+                var subProtections = executable.RunExecutableChecks(fileName, pex, StaticChecks.PortableExecutableCheckClasses, _options.IncludeDebug);
                 protections.Append(fileName, subProtections.Values);
 
                 // Extractable checks