Bump version

* Add model for sim file

* Add sim parsing for steam2 installer set

* First round of fixes

.editorconfig

@@ -0,0 +1,167 @@
+# top-most EditorConfig file
+root = true
+
+# C# files
+[*.cs]
+
+# Indentation and spacing
+charset = utf-8
+indent_size = 4
+indent_style = space
+tab_width = 4
+trim_trailing_whitespace = true
+
+# New line preferences
+end_of_line = lf
+insert_final_newline = true
+max_line_length = unset
+
+# using directive preferences
+csharp_using_directive_placement = outside_namespace
+dotnet_diagnostic.IDE0005.severity = error
+
+# Code-block preferences
+csharp_style_namespace_declarations = block_scoped
+csharp_style_prefer_method_group_conversion = true
+csharp_style_prefer_top_level_statements = false
+
+# Expression-level preferences
+csharp_prefer_simple_default_expression = true
+csharp_style_inlined_variable_declaration = true
+csharp_style_unused_value_assignment_preference = discard_variable
+csharp_style_unused_value_expression_statement_preference = discard_variable
+dotnet_diagnostic.IDE0001.severity = warning
+dotnet_diagnostic.IDE0002.severity = warning
+dotnet_diagnostic.IDE0004.severity = warning
+dotnet_diagnostic.IDE0010.severity = error
+dotnet_diagnostic.IDE0051.severity = warning
+dotnet_diagnostic.IDE0052.severity = warning
+dotnet_diagnostic.IDE0072.severity = warning
+dotnet_diagnostic.IDE0080.severity = warning
+dotnet_diagnostic.IDE0100.severity = error
+dotnet_diagnostic.IDE0110.severity = error
+dotnet_diagnostic.IDE0120.severity = warning
+dotnet_diagnostic.IDE0121.severity = warning
+dotnet_diagnostic.IDE0240.severity = error
+dotnet_diagnostic.IDE0241.severity = error
+dotnet_style_coalesce_expression = true
+dotnet_style_namespace_match_folder = false
+dotnet_style_null_propagation = true
+dotnet_style_prefer_auto_properties = true
+dotnet_style_prefer_collection_expression = when_types_loosely_match
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true
+dotnet_style_prefer_compound_assignment = true
+csharp_style_prefer_simple_property_accessors = true
+dotnet_style_prefer_simplified_interpolation = true
+dotnet_style_prefer_simplified_boolean_expressions = true
+csharp_style_prefer_unbound_generic_type_in_nameof = true
+
+# Field preferences
+dotnet_diagnostic.IDE0044.severity = warning
+dotnet_style_readonly_field = true
+
+# Language keyword vs. framework types preferences
+dotnet_diagnostic.IDE0049.severity = error
+dotnet_style_predefined_type_for_locals_parameters_members = true
+dotnet_style_predefined_type_for_member_access = true
+
+# Modifier preferences
+csharp_prefer_static_local_function = true
+csharp_style_prefer_readonly_struct = true
+dotnet_diagnostic.IDE0036.severity = warning
+dotnet_diagnostic.IDE0040.severity = error
+dotnet_diagnostic.IDE0380.severity = error
+dotnet_style_require_accessibility_modifiers = always
+
+# New-line preferences
+dotnet_diagnostic.IDE2000.severity = warning
+dotnet_diagnostic.IDE2002.severity = warning
+dotnet_diagnostic.IDE2003.severity = warning
+dotnet_diagnostic.IDE2004.severity = warning
+dotnet_diagnostic.IDE2005.severity = warning
+dotnet_diagnostic.IDE2006.severity = warning
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = false
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = false
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false
+dotnet_style_allow_multiple_blank_lines_experimental = false
+dotnet_style_allow_statement_immediately_after_block_experimental = false
+
+# Null-checking preferences
+csharp_style_conditional_delegate_call = true
+
+# Parameter preferences
+dotnet_code_quality_unused_parameters = all
+dotnet_diagnostic.IDE0280.severity = error
+
+# Parentheses preferences
+dotnet_diagnostic.IDE0047.severity = warning
+dotnet_diagnostic.IDE0048.severity = warning
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_operators = always_for_clarity
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
+
+# Pattern-matching preferences
+dotnet_diagnostic.IDE0019.severity = warning
+dotnet_diagnostic.IDE0020.severity = warning
+dotnet_diagnostic.IDE0038.severity = warning
+dotnet_diagnostic.IDE0066.severity = none
+dotnet_diagnostic.IDE0083.severity = warning
+dotnet_diagnostic.IDE0260.severity = warning
+csharp_style_pattern_matching_over_as_with_null_check = true
+csharp_style_pattern_matching_over_is_with_cast_check = true
+csharp_style_prefer_not_pattern = true
+csharp_style_prefer_pattern_matching = true
+
+# this. and Me. preferences
+dotnet_style_qualification_for_event = false
+dotnet_style_qualification_for_field = false
+dotnet_style_qualification_for_method = false
+dotnet_style_qualification_for_property = false
+
+# var preferences
+csharp_style_var_for_built_in_types = false
+csharp_style_var_when_type_is_apparent = true
+
+# .NET formatting options
+dotnet_separate_import_directive_groups = false
+dotnet_sort_system_directives_first = true
+
+# C# formatting options
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_open_brace = all
+csharp_new_line_between_query_expression_clauses = true
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false

.github/workflows/build_and_test.yml

@@ -1,40 +1,48 @@
 name: Build and Test
 
 on:
-  push:
-    branches: [ "main" ]
+    push:
+        branches: ["main"]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+    build:
+        runs-on: ubuntu-latest
 
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-    
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: |
-            6.0.x
-            8.0.x
-            9.0.x
-        
-    - name: Run tests
-      run: dotnet test
-      
-    - name: Run publish script
-      run: ./publish-nix.sh -d
+        steps:
+            - uses: actions/checkout@v5
+              with:
+                  fetch-depth: 0
 
-    - name: Upload to rolling
-      uses: ncipollo/release-action@v1.14.0
-      with:
-        allowUpdates: True
-        artifacts: "*.nupkg,*.snupkg,*.zip"
-        body: 'Last built commit: ${{ github.sha }}'
-        name: 'Rolling Release'
-        prerelease: True
-        replacesArtifacts: True
-        tag: "rolling"
-        updateOnlyUnreleased: True
+            - name: Setup .NET
+              uses: actions/setup-dotnet@v5
+              with:
+                  dotnet-version: |
+                      8.0.x
+                      9.0.x
+                      10.0.x
+
+            - name: Run tests
+              run: dotnet test
+
+            - name: Run publish script
+              run: ./publish-nix.sh -d
+
+            - name: Update rolling tag
+              run: |
+                  git config user.name "github-actions[bot]"
+                  git config user.email "github-actions[bot]@users.noreply.github.com"
+                  git tag -f rolling
+                  git push origin :refs/tags/rolling || true
+                  git push origin rolling --force
+
+            - name: Upload to rolling
+              uses: ncipollo/release-action@v1.20.0
+              with:
+                  allowUpdates: True
+                  artifacts: "*.nupkg,*.snupkg,*.zip"
+                  body: "Last built commit: ${{ github.sha }}"
+                  name: "Rolling Release"
+                  prerelease: True
+                  replacesArtifacts: True
+                  tag: "rolling"
+                  updateOnlyUnreleased: True

.github/workflows/check_pr.yml

@@ -3,21 +3,21 @@ name: Build PR
 on: [pull_request]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: |
-            6.0.x
-            8.0.x
-            9.0.x
-      
-    - name: Build
-      run: dotnet build
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v5
 
-    - name: Run tests
-      run: dotnet test
+            - name: Setup .NET
+              uses: actions/setup-dotnet@v5
+              with:
+                  dotnet-version: |
+                      8.0.x
+                      9.0.x
+                      10.0.x
+
+            - name: Build
+              run: dotnet build
+
+            - name: Run tests
+              run: dotnet test

.gitignore

@@ -4,6 +4,7 @@
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
+*.lscache
 *.suo
 *.user
 *.userosscache

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "SabreTools.Serialization/_EXTERNAL/stormlibsharp"]
-	path = SabreTools.Serialization/_EXTERNAL/stormlibsharp
-	url = https://github.com/robpaveza/stormlibsharp.git

.vscode/launch.json

@@ -1,16 +1,16 @@
 {
-   // Use IntelliSense to find out which attributes exist for C# debugging
-   // Use hover for the description of the existing attributes
-   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
-   "version": "0.2.0",
-   "configurations": [
+    // Use IntelliSense to find out which attributes exist for C# debugging
+    // Use hover for the description of the existing attributes
+    // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+    "version": "0.2.0",
+    "configurations": [
         {
             "name": ".NET Core Launch (ExtractionTool)",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/ExtractionTool/bin/Debug/net9.0/ExtractionTool.dll",
+            "program": "${workspaceFolder}/ExtractionTool/bin/Debug/net10.0/ExtractionTool.dll",
             "args": [],
             "cwd": "${workspaceFolder}",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
@@ -24,7 +24,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/InfoPrint/bin/Debug/net9.0/InfoPrint.dll",
+            "program": "${workspaceFolder}/InfoPrint/bin/Debug/net10.0/InfoPrint.dll",
             "args": [],
             "cwd": "${workspaceFolder}",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console

ExtractionTool/ExtractionTool.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
         <OutputType>Exe</OutputType>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
@@ -10,7 +10,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>2.0.1</Version>
+        <Version>3.2.0</Version>
     </PropertyGroup>
 
     <!-- Support All Frameworks -->
@@ -20,33 +20,23 @@
     <PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
     </PropertyGroup>
-    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`))">
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`)) OR $(TargetFramework.StartsWith(`net10`))">
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     </PropertyGroup>
     <PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
-        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
     </PropertyGroup>
 
     <!-- These are needed for dealing with native Windows DLLs -->
     <ItemGroup Condition="'$(RuntimeIdentifier)'=='win-x86'">
-        <ContentWithTargetPath Include="..\SabreTools.Serialization\runtimes\win-x86\native\CascLib.dll">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-            <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-            <TargetPath>CascLib.dll</TargetPath>
-        </ContentWithTargetPath>
-        <ContentWithTargetPath Include="..\SabreTools.Serialization\runtimes\win-x86\native\StormLib.dll">
+        <ContentWithTargetPath Include="..\runtimes\win-x86\native\StormLib.dll">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
             <CopyToPublishDirectory>Always</CopyToPublishDirectory>
             <TargetPath>StormLib.dll</TargetPath>
         </ContentWithTargetPath>
     </ItemGroup>
     <ItemGroup Condition="'$(RuntimeIdentifier)'=='win-x64'">
-        <ContentWithTargetPath Include="..\SabreTools.Serialization\runtimes\win-x64\native\CascLib.dll">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-            <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-            <TargetPath>CascLib.dll</TargetPath>
-        </ContentWithTargetPath>
-        <ContentWithTargetPath Include="..\SabreTools.Serialization\runtimes\win-x64\native\StormLib.dll">
+        <ContentWithTargetPath Include="..\runtimes\win-x64\native\StormLib.dll">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
             <CopyToPublishDirectory>Always</CopyToPublishDirectory>
             <TargetPath>StormLib.dll</TargetPath>
@@ -54,12 +44,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\SabreTools.Serialization\SabreTools.Serialization.csproj" />
+        <ProjectReference Include="..\SabreTools.Wrappers\SabreTools.Wrappers.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SabreTools.IO" Version="[1.7.5]" />
-        <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.9" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
+        <PackageReference Include="SabreTools.CommandLine" Version="1.5.0" />
+        <PackageReference Include="SabreTools.IO" Version="2.3.0" />
+        <PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.11" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
     </ItemGroup>
 
 </Project>

ExtractionTool/Features/MainFeature.cs

@@ -0,0 +1,194 @@
+using System;
+using System.IO;
+using SabreTools.CommandLine;
+using SabreTools.CommandLine.Inputs;
+using SabreTools.IO.Extensions;
+using SabreTools.Numerics.Extensions;
+using SabreTools.Wrappers;
+
+namespace ExtractionTool.Features
+{
+    internal sealed class MainFeature : Feature
+    {
+        #region Feature Definition
+
+        public const string DisplayName = "main";
+
+        /// <remarks>Flags are unused</remarks>
+        private static readonly string[] _flags = [];
+
+        /// <remarks>Description is unused</remarks>
+        private const string _description = "";
+
+        #endregion
+
+        #region Inputs
+
+        private const string _debugName = "debug";
+        internal readonly FlagInput DebugInput = new(_debugName, ["-d", "--debug"], "Enable debug mode");
+
+        private const string _outputPathName = "output-path";
+        internal readonly StringInput OutputPathInput = new(_outputPathName, ["-o", "--outdir"], "Set output path for extraction (required)");
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Enable debug output for relevant operations
+        /// </summary>
+        public bool Debug { get; private set; }
+
+        /// <summary>
+        /// Output path for archive extraction
+        /// </summary>
+        public string OutputPath { get; private set; } = string.Empty;
+
+        #endregion
+
+        public MainFeature()
+            : base(DisplayName, _flags, _description)
+        {
+            RequiresInputs = true;
+
+            Add(DebugInput);
+            Add(OutputPathInput);
+        }
+
+        /// <inheritdoc/>
+        public override bool Execute()
+        {
+            // Get the options from the arguments
+            Debug = GetBoolean(_debugName);
+            OutputPath = GetString(_outputPathName) ?? string.Empty;
+
+            // Validate the output path
+            if (!ValidateExtractionPath())
+                return false;
+
+            // Loop through the input paths
+            for (int i = 0; i < Inputs.Count; i++)
+            {
+                string arg = Inputs[i];
+                ExtractPath(arg);
+            }
+
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public override bool VerifyInputs() => Inputs.Count > 0;
+
+        /// <summary>
+        /// Wrapper to extract data for a single path
+        /// </summary>
+        /// <param name="path">File or directory path</param>
+        private void ExtractPath(string path)
+        {
+            // Normalize by getting the full path
+            path = Path.GetFullPath(path);
+            Console.WriteLine($"Checking possible path: {path}");
+
+            // Check if the file or directory exists
+            if (File.Exists(path))
+            {
+                ExtractFile(path);
+            }
+            else if (Directory.Exists(path))
+            {
+                foreach (string file in path.SafeEnumerateFiles("*", SearchOption.AllDirectories))
+                {
+                    ExtractFile(file);
+                }
+            }
+            else
+            {
+                Console.WriteLine($"{path} does not exist, skipping...");
+            }
+        }
+
+        /// <summary>
+        /// Print information for a single file, if possible
+        /// </summary>
+        /// <param name="path">File path</param>
+        private void ExtractFile(string file)
+        {
+            try
+            {
+                Console.WriteLine($"Attempting to extract all files from {file}");
+                using Stream stream = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+
+                // Read the first 32 bytes
+                byte[] magic = stream.PeekBytes(32);
+
+                // Get the file type
+                string extension = Path.GetExtension(file).TrimStart('.');
+                WrapperType ft = WrapperFactory.GetFileType(magic ?? [], extension);
+
+                // Print out the file format
+                Console.WriteLine($"File format found: {ft}");
+
+                // Setup the wrapper to extract
+                var wrapper = WrapperFactory.CreateWrapper(ft, stream);
+
+                // If we don't have a wrapper
+                if (wrapper is null)
+                {
+                    Console.WriteLine($"Either {ft} is not supported or something went wrong during parsing!");
+                    Console.WriteLine();
+                    return;
+                }
+
+                // If the wrapper is not extractable
+                if (wrapper is not IExtractable extractable)
+                {
+                    Console.WriteLine($"{ft} is not supported for extraction!");
+                    Console.WriteLine();
+                    return;
+                }
+
+                // Print the preamble
+                Console.WriteLine($"Attempting to extract from '{wrapper.Description()}'");
+                Console.WriteLine();
+
+                // Attempt the extraction
+                Directory.CreateDirectory(OutputPath);
+                extractable.Extract(OutputPath, Debug);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(Debug ? ex : "[Exception opening file, please try again]");
+                Console.WriteLine();
+            }
+        }
+
+        /// <summary>
+        /// Validate the extraction path
+        /// </summary>
+        private bool ValidateExtractionPath()
+        {
+            // Null or empty output path
+            if (string.IsNullOrEmpty(OutputPath))
+            {
+                Console.WriteLine("Output directory required for extraction!");
+                Console.WriteLine();
+                return false;
+            }
+
+            // Malformed output path or invalid location
+            try
+            {
+                OutputPath = Path.GetFullPath(OutputPath);
+                Directory.CreateDirectory(OutputPath);
+            }
+            catch
+            {
+                Console.WriteLine("Output directory could not be created!");
+                Console.WriteLine();
+                return false;
+            }
+
+            return true;
+        }
+    }
+}

ExtractionTool/Options.cs

@@ -1,129 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace ExtractionTool
-{
-    /// <summary>
-    /// Set of options for the test executable
-    /// </summary>
-    internal sealed class Options
-    {
-        #region Properties
-
-        /// <summary>
-        /// Enable debug output for relevant operations
-        /// </summary>
-        public bool Debug { get; private set; } = false;
-
-        /// <summary>
-        /// Set of input paths to use for operations
-        /// </summary>
-        public List<string> InputPaths { get; private set; } = [];
-
-        /// <summary>
-        /// Output path for archive extraction
-        /// </summary>
-        public string OutputPath { get; private set; } = string.Empty;
-
-        #endregion
-
-        /// <summary>
-        /// Parse commandline arguments into an Options object
-        /// </summary>
-        public static Options? ParseOptions(string[] args)
-        {
-            // If we have invalid arguments
-            if (args == null || args.Length == 0)
-                return null;
-
-            // Create an Options object
-            var options = new Options();
-
-            // Parse the options and paths
-            for (int index = 0; index < args.Length; index++)
-            {
-                string arg = args[index];
-                switch (arg)
-                {
-                    case "-?":
-                    case "-h":
-                    case "--help":
-                        return null;
-
-                    case "-d":
-                    case "--debug":
-                        options.Debug = true;
-                        break;
-
-                    case "-o":
-                    case "--outdir":
-                        options.OutputPath = index + 1 < args.Length ? args[++index] : string.Empty;
-                        break;
-
-                    default:
-                        options.InputPaths.Add(arg);
-                        break;
-                }
-            }
-
-            // Validate we have any input paths to work on
-            if (options.InputPaths.Count == 0)
-            {
-                Console.WriteLine("At least one path is required!");
-                return null;
-            }
-
-            // Validate the output path
-            bool validPath = ValidateExtractionPath(options);
-            if (!validPath)
-                return null;
-
-            return options;
-        }
-
-        /// <summary>
-        /// Display help text
-        /// </summary>
-        public static void DisplayHelp()
-        {
-            Console.WriteLine("Extraction Tool");
-            Console.WriteLine();
-            Console.WriteLine("ExtractionTool.exe <options> file|directory ...");
-            Console.WriteLine();
-            Console.WriteLine("Options:");
-            Console.WriteLine("-?, -h, --help           Display this help text and quit");
-            Console.WriteLine("-d, --debug              Enable debug mode");
-            Console.WriteLine("-o, --outdir [PATH]      Set output path for extraction (required)");
-        }
-
-        /// <summary>
-        /// Validate the extraction path
-        /// </summary>
-        private static bool ValidateExtractionPath(Options options)
-        {
-            // Null or empty output path
-            if (string.IsNullOrEmpty(options.OutputPath))
-            {
-                Console.WriteLine("Output directory required for extraction!");
-                Console.WriteLine();
-                return false;
-            }
-
-            // Malformed output path or invalid location
-            try
-            {
-                options.OutputPath = Path.GetFullPath(options.OutputPath);
-                Directory.CreateDirectory(options.OutputPath);
-            }
-            catch
-            {
-                Console.WriteLine("Output directory could not be created!");
-                Console.WriteLine();
-                return false;
-            }
-
-            return true;
-        }
-    }
-}

ExtractionTool/Program.cs

@@ -1,250 +1,79 @@
 using System;
-using System.IO;
-using SabreTools.IO.Extensions;
-using SabreTools.Serialization;
-using SabreTools.Serialization.Wrappers;
+using System.Collections.Generic;
+using ExtractionTool.Features;
+using SabreTools.CommandLine;
+using SabreTools.CommandLine.Features;
 
 namespace ExtractionTool
 {
-    class Program
+    public static class Program
     {
-        static void Main(string[] args)
+        public static void Main(string[] args)
         {
 #if NET462_OR_GREATER || NETCOREAPP
             // Register the codepages
             System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
 #endif
 
-            // Get the options from the arguments
-            var options = Options.ParseOptions(args);
+            // Create the command set
+            var mainFeature = new MainFeature();
+            var commandSet = CreateCommands(mainFeature);
 
-            // If we have an invalid state
-            if (options == null)
+            // If we have no args, show the help and quit
+            if (args is null || args.Length == 0)
             {
-                Options.DisplayHelp();
+                commandSet.OutputAllHelp();
                 return;
             }
 
-            // Loop through the input paths
-            foreach (string inputPath in options.InputPaths)
+            // Cache the first argument and starting index
+            string featureName = args[0];
+
+            // Try processing the standalone arguments
+            var topLevel = commandSet.GetTopLevel(featureName);
+            switch (topLevel)
             {
-                ExtractPath(inputPath, options.OutputPath, options.Debug);
-            }
-        }
+                // Standalone Options
+                case Help help: help.ProcessArgs(args, 0, commandSet); return;
 
-        /// <summary>
-        /// Wrapper to extract data for a single path
-        /// </summary>
-        /// <param name="path">File or directory path</param>
-        /// <param name="outputDirectory">Output directory path</param>
-        /// <param name="includeDebug">Enable including debug information</param>
-        private static void ExtractPath(string path, string outputDirectory, bool includeDebug)
-        {
-            // Normalize by getting the full path
-            path = Path.GetFullPath(path);
-            Console.WriteLine($"Checking possible path: {path}");
-
-            // Check if the file or directory exists
-            if (File.Exists(path))
-            {
-                ExtractFile(path, outputDirectory, includeDebug);
-            }
-            else if (Directory.Exists(path))
-            {
-                foreach (string file in IOExtensions.SafeEnumerateFiles(path, "*", SearchOption.AllDirectories))
-                {
-                    ExtractFile(file, outputDirectory, includeDebug);
-                }
-            }
-            else
-            {
-                Console.WriteLine($"{path} does not exist, skipping...");
-            }
-        }
-
-        /// <summary>
-        /// Print information for a single file, if possible
-        /// </summary>
-        private static void ExtractFile(string file, string outputDirectory, bool includeDebug)
-        {
-            Console.WriteLine($"Attempting to extract all files from {file}");
-            using Stream stream = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-
-            // Get the extension for certain checks
-            string extension = Path.GetExtension(file).ToLower().TrimStart('.');
-
-            // Get the first 16 bytes for matching
-            byte[] magic = new byte[16];
-            try
-            {
-                int read = stream.Read(magic, 0, 16);
-                stream.Seek(0, SeekOrigin.Begin);
-            }
-            catch (Exception ex)
-            {
-                if (includeDebug) Console.Error.WriteLine(ex);
-                return;
-            }
-
-            // Get the file type
-            WrapperType ft = WrapperFactory.GetFileType(magic, extension);
-            var wrapper = WrapperFactory.CreateWrapper(ft, stream);
-
-            // Create the output directory
-            Directory.CreateDirectory(outputDirectory);
-
-            // Print the preamble
-            Console.WriteLine($"Attempting to extract from '{wrapper?.Description() ?? "UNKNOWN"}'");
-            Console.WriteLine();
-
-            switch (wrapper)
-            {
-                // 7-zip
-                case SevenZip sz:
-                    sz.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // BFPK archive
-                case BFPK bfpk:
-                    bfpk.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // BSP
-                case BSP bsp:
-                    bsp.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // bzip2
-                case BZip2 bzip2:
-                    bzip2.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // CFB
-                case CFB cfb:
-                    cfb.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // GCF
-                case GCF gcf:
-                    gcf.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // gzip
-                case GZip gzip:
-                    gzip.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // InstallShield Archive V3 (Z)
-                case InstallShieldArchiveV3 isv3:
-                    isv3.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // IS-CAB archive
-                case InstallShieldCabinet iscab:
-                    iscab.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // LZ-compressed file, KWAJ variant
-                case LZKWAJ kwaj:
-                    kwaj.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // LZ-compressed file, QBasic variant
-                case LZQBasic qbasic:
-                    qbasic.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // LZ-compressed file, SZDD variant
-                case LZSZDD szdd:
-                    szdd.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // Microsoft Cabinet archive
-                case MicrosoftCabinet mscab:
-                    mscab.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // MoPaQ (MPQ) archive
-                case MoPaQ mpq:
-                    mpq.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // New Executable
-                case NewExecutable nex:
-                    nex.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // PAK
-                case PAK pak:
-                    pak.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // PFF
-                case PFF pff:
-                    pff.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // PKZIP
-                case PKZIP pkzip:
-                    pkzip.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // Portable Executable
-                case PortableExecutable pex:
-                    pex.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // Quantum
-                case Quantum quantum:
-                    quantum.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // RAR
-                case RAR rar:
-                    rar.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // SGA
-                case SGA sga:
-                    sga.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // Tape Archive
-                case TapeArchive tar:
-                    tar.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // VBSP
-                case VBSP vbsp:
-                    vbsp.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // VPK
-                case VPK vpk:
-                    vpk.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // WAD3
-                case WAD3 wad:
-                    wad.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // xz
-                case XZ xz:
-                    xz.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // XZP
-                case XZP xzp:
-                    xzp.Extract(outputDirectory, includeDebug);
-                    break;
-
-                // Everything else
+                // Default Behavior
                 default:
-                    Console.WriteLine("Not a supported extractable file format, skipping...");
-                    Console.WriteLine();
+                    if (!mainFeature.ProcessArgs(args, 0))
+                    {
+                        commandSet.OutputAllHelp();
+                        return;
+                    }
+                    else if (!mainFeature.VerifyInputs())
+                    {
+                        Console.Error.WriteLine("At least one input is required");
+                        commandSet.OutputAllHelp();
+                        return;
+                    }
+
+                    mainFeature.Execute();
                     break;
             }
         }
+
+        /// <summary>
+        /// Create the command set for the program
+        /// </summary>
+        private static CommandSet CreateCommands(MainFeature mainFeature)
+        {
+            List<string> header = [
+                "Extraction Tool",
+                string.Empty,
+                "ExtractionTool <options> file|directory ...",
+                string.Empty,
+            ];
+
+            var commandSet = new CommandSet(header);
+
+            commandSet.Add(new Help(["-?", "-h", "--help"]));
+            commandSet.Add(mainFeature.DebugInput);
+            commandSet.Add(mainFeature.OutputPathInput);
+
+            return commandSet;
+        }
     }
 }

InfoPrint/Features/MainFeature.cs

@@ -0,0 +1,284 @@
+using System;
+using System.IO;
+using System.Text;
+using SabreTools.CommandLine;
+using SabreTools.CommandLine.Inputs;
+using SabreTools.Hashing;
+using SabreTools.IO.Extensions;
+using SabreTools.Numerics.Extensions;
+using SabreTools.Wrappers;
+
+namespace InfoPrint.Features
+{
+    internal sealed class MainFeature : Feature
+    {
+        #region Feature Definition
+
+        public const string DisplayName = "main";
+
+        /// <remarks>Flags are unused</remarks>
+        private static readonly string[] _flags = [];
+
+        /// <remarks>Description is unused</remarks>
+        private const string _description = "";
+
+        #endregion
+
+        #region Inputs
+
+        private const string _debugName = "debug";
+        internal readonly FlagInput DebugInput = new(_debugName, ["-d", "--debug"], "Enable debug mode");
+
+        private const string _fileOnlyName = "file-only";
+        internal readonly FlagInput FileOnlyInput = new(_fileOnlyName, ["-f", "--file"], "Print to file only");
+
+        private const string _hashName = "hash";
+        internal readonly FlagInput HashInput = new(_hashName, ["-c", "--hash"], "Output file hashes");
+
+        private const string _jsonName = "json";
+        internal readonly FlagInput JsonInput = new(_jsonName, ["-j", "--json"], "Print info as JSON");
+
+        private const string _recursiveName = "recursive";
+        internal readonly FlagInput RecursiveInput = new(_recursiveName, ["-r", "--recursive"], "Recursively print info from embedded files");
+
+        #endregion
+
+        /// <summary>
+        /// Enable debug output for relevant operations
+        /// </summary>
+        public bool Debug { get; private set; }
+
+        /// <summary>
+        /// Output information to file only, skip printing to console
+        /// </summary>
+        public bool FileOnly { get; private set; }
+
+        /// <summary>
+        /// Print external file hashes
+        /// </summary>
+        public bool Hash { get; private set; }
+
+        /// <summary>
+        /// Enable JSON output
+        /// </summary>
+        public bool Json { get; private set; }
+
+        /// <summary>
+        /// Enable outputting subfile information
+        /// </summary>
+        public bool Recursive { get; private set; }
+
+        public MainFeature()
+            : base(DisplayName, _flags, _description)
+        {
+            RequiresInputs = true;
+
+            Add(DebugInput);
+            Add(HashInput);
+            Add(FileOnlyInput);
+            Add(JsonInput);
+            Add(RecursiveInput);
+        }
+
+        /// <inheritdoc/>
+        public override bool Execute()
+        {
+            // Get the options from the arguments
+            Debug = GetBoolean(_debugName);
+            Hash = GetBoolean(_hashName);
+            FileOnly = GetBoolean(_fileOnlyName);
+            Json = GetBoolean(_jsonName);
+            Recursive = GetBoolean(_recursiveName);
+
+            // Loop through the input paths
+            for (int i = 0; i < Inputs.Count; i++)
+            {
+                string arg = Inputs[i];
+                PrintPathInfo(arg);
+            }
+
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public override bool VerifyInputs() => Inputs.Count > 0;
+
+        /// <summary>
+        /// Wrapper to print information for a single path
+        /// </summary>
+        /// <param name="path">File or directory path</param>
+        private void PrintPathInfo(string path)
+        {
+            Console.WriteLine($"Checking possible path: {path}");
+
+            // Check if the file or directory exists
+            if (File.Exists(path))
+            {
+                PrintFileInfo(path);
+            }
+            else if (Directory.Exists(path))
+            {
+                foreach (string file in path.SafeEnumerateFiles("*", SearchOption.AllDirectories))
+                {
+                    PrintFileInfo(file);
+                }
+            }
+            else
+            {
+                Console.WriteLine($"{path} does not exist, skipping...");
+            }
+        }
+
+        /// <summary>
+        /// Print information for a single file, if possible
+        /// </summary>
+        /// <param name="file">File path</param>
+        private void PrintFileInfo(string file)
+        {
+            Console.WriteLine($"Attempting to print info for {file}");
+
+            // Get the base info output name
+            string filenameBase = $"info-{DateTime.Now:yyyy-MM-dd_HHmmss.ffff}";
+
+            // If we have the hash flag
+            if (Hash)
+            {
+                var hashBuilder = PrintHashInfo(file);
+                if (hashBuilder is not null)
+                {
+                    // Create the output data
+                    string hashData = hashBuilder.ToString();
+
+                    // Write the output data
+                    using var hsw = new StreamWriter(File.OpenWrite($"{filenameBase}.hashes"));
+                    hsw.WriteLine(hashData);
+                    hsw.Flush();
+                }
+            }
+
+            try
+            {
+                using Stream stream = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+
+                // Read the first 32 bytes
+                byte[] magic = stream.PeekBytes(32);
+
+                // Get the file type
+                string extension = Path.GetExtension(file).TrimStart('.');
+                WrapperType ft = WrapperFactory.GetFileType(magic ?? [], extension);
+
+                // Print out the file format
+                Console.WriteLine($"File format found: {ft}");
+
+                // Setup the wrapper to print
+                var wrapper = WrapperFactory.CreateWrapper(ft, stream);
+
+                // If we don't have a wrapper
+                if (wrapper is null)
+                {
+                    Console.WriteLine($"Either {ft} is not supported or something went wrong during parsing!");
+                    Console.WriteLine();
+                    return;
+                }
+
+                // If the wrapper is not printable
+                if (wrapper is not IPrintable printable)
+                {
+                    Console.WriteLine($"{ft} is not supported for printing!");
+                    Console.WriteLine();
+                    return;
+                }
+
+                // If we have the JSON flag
+                if (Json)
+                {
+                    // Create the output data
+                    string serializedData = printable.ExportJSON(Recursive);
+
+                    // Write the output data
+                    using var jsw = new StreamWriter(File.OpenWrite($"{filenameBase}.json"));
+                    jsw.WriteLine(serializedData);
+                    jsw.Flush();
+                }
+
+                // Create the output data
+                var builder = new StringBuilder();
+                printable.PrintInformation(builder, Recursive);
+
+                // Only print to console if enabled
+                if (!FileOnly)
+                    Console.WriteLine(builder);
+
+                using var sw = new StreamWriter(File.OpenWrite($"{filenameBase}.txt"));
+                sw.WriteLine(file);
+                sw.WriteLine();
+                sw.WriteLine(builder.ToString());
+                sw.Flush();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(Debug ? ex : "[Exception opening file, please try again]");
+                Console.WriteLine();
+            }
+        }
+
+        /// <summary>
+        /// Print hash information for a single file, if possible
+        /// </summary>
+        /// <param name="file">File path</param>
+        /// <returns>StringBuilder representing the hash information, if possible</returns>
+        private StringBuilder? PrintHashInfo(string file)
+        {
+            // Ignore missing files
+            if (!File.Exists(file))
+                return null;
+
+            Console.WriteLine($"Attempting to hash {file}, this may take a while...");
+
+            try
+            {
+                // Get all file hashes for flexibility
+                var hashes = HashTool.GetFileHashes(file);
+                if (hashes is null)
+                {
+                    if (Debug) Console.WriteLine($"Hashes for {file} could not be retrieved");
+                    return null;
+                }
+
+                // Output subset of available hashes
+                var builder = new StringBuilder();
+                if (hashes.TryGetValue(HashType.CRC16, out string? crc16) && crc16 is not null)
+                    builder.AppendLine($"CRC-16 checksum: {crc16}");
+                if (hashes.TryGetValue(HashType.CRC32, out string? crc32) && crc32 is not null)
+                    builder.AppendLine($"CRC-32 checksum: {crc32}");
+                if (hashes.TryGetValue(HashType.CRC64, out string? crc64) && crc64 is not null)
+                    builder.AppendLine($"CRC-64 checksum: {crc64}");
+                if (hashes.TryGetValue(HashType.MD2, out string? md2) && md2 is not null)
+                    builder.AppendLine($"MD2 hash: {md2}");
+                if (hashes.TryGetValue(HashType.MD4, out string? md4) && md4 is not null)
+                    builder.AppendLine($"MD4 hash: {md4}");
+                if (hashes.TryGetValue(HashType.MD5, out string? md5) && md5 is not null)
+                    builder.AppendLine($"MD5 hash: {md5}");
+                if (hashes.TryGetValue(HashType.RIPEMD128, out string? ripemd128) && ripemd128 is not null)
+                    builder.AppendLine($"RIPEMD-128 hash: {ripemd128}");
+                if (hashes.TryGetValue(HashType.RIPEMD160, out string? ripemd160) && ripemd160 is not null)
+                    builder.AppendLine($"RIPEMD-160 hash: {ripemd160}");
+                if (hashes.TryGetValue(HashType.SHA1, out string? sha1) && sha1 is not null)
+                    builder.AppendLine($"SHA-1 hash: {sha1}");
+                if (hashes.TryGetValue(HashType.SHA256, out string? sha256) && sha256 is not null)
+                    builder.AppendLine($"SHA-256 hash: {sha256}");
+                if (hashes.TryGetValue(HashType.SHA384, out string? sha384) && sha384 is not null)
+                    builder.AppendLine($"SHA-384 hash: {sha384}");
+                if (hashes.TryGetValue(HashType.SHA512, out string? sha512) && sha512 is not null)
+                    builder.AppendLine($"SHA-512 hash: {sha512}");
+
+                return builder;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(Debug ? ex : "[Exception opening file, please try again]");
+                return null;
+            }
+        }
+    }
+}

InfoPrint/InfoPrint.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
         <OutputType>Exe</OutputType>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
@@ -10,7 +10,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>2.0.1</Version>
+        <Version>3.2.0</Version>
     </PropertyGroup>
 
     <!-- Support All Frameworks -->
@@ -20,20 +20,21 @@
     <PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
     </PropertyGroup>
-    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`))">
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`)) OR $(TargetFramework.StartsWith(`net10`))">
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     </PropertyGroup>
     <PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
-        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\SabreTools.Serialization\SabreTools.Serialization.csproj" />
+        <ProjectReference Include="..\SabreTools.Wrappers\SabreTools.Wrappers.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SabreTools.IO" Version="[1.7.5]" />
-        <PackageReference Include="SabreTools.Hashing" Version="[1.5.0]" />
+        <PackageReference Include="SabreTools.CommandLine" Version="1.5.0" />
+        <PackageReference Include="SabreTools.Hashing" Version="2.1.0" />
+        <PackageReference Include="SabreTools.IO" Version="2.3.0" />
     </ItemGroup>
 
 </Project>

InfoPrint/Options.cs

@@ -1,141 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace InfoPrint
-{
-    /// <summary>
-    /// Set of options for the test executable
-    /// </summary>
-    internal sealed class Options
-    {
-        #region Properties
-
-        /// <summary>
-        /// Enable debug output for relevant operations
-        /// </summary>
-        public bool Debug { get; private set; } = false;
-
-        /// <summary>
-        /// Output information to file only, skip printing to console
-        /// </summary>
-        public bool FileOnly { get; private set; } = false;
-
-        /// <summary>
-        /// Print external file hashes
-        /// </summary>
-        public bool Hash { get; private set; } = false;
-
-        /// <summary>
-        /// Set of input paths to use for operations
-        /// </summary>
-        public List<string> InputPaths { get; private set; } = [];
-
-#if NETCOREAPP
-        /// <summary>
-        /// Enable JSON output
-        /// </summary>
-        public bool Json { get; private set; } = false;
-#endif
-
-        #endregion
-
-        /// <summary>
-        /// Parse commandline arguments into an Options object
-        /// </summary>
-        public static Options? ParseOptions(string[] args)
-        {
-            // If we have invalid arguments
-            if (args == null || args.Length == 0)
-                return null;
-
-            // Create an Options object
-            var options = new Options();
-
-            // Parse the features
-            int index = 0;
-            for (; index < args.Length; index++)
-            {
-                string arg = args[index];
-                bool featureFound = false;
-                switch (arg)
-                {
-                    case "-?":
-                    case "-h":
-                    case "--help":
-                        return null;
-
-                    default:
-                        break;
-                }
-
-                // If the flag wasn't a feature
-                if (!featureFound)
-                    break;
-            }
-
-            // Parse the options and paths
-            for (; index < args.Length; index++)
-            {
-                string arg = args[index];
-                switch (arg)
-                {
-                    case "-d":
-                    case "--debug":
-                        options.Debug = true;
-                        break;
-
-                    case "-c":
-                    case "--hash":
-                        options.Hash = true;
-                        break;
-
-                    case "-f":
-                    case "--file":
-                        options.FileOnly = true;
-                        break;
-
-                    case "-j":
-                    case "--json":
-#if NETCOREAPP
-                        options.Json = true;
-#else
-                        Console.WriteLine("JSON output not available in .NET Framework");
-#endif
-                        break;
-
-                    default:
-                        options.InputPaths.Add(arg);
-                        break;
-                }
-            }
-
-            // Validate we have any input paths to work on
-            if (options.InputPaths.Count == 0)
-            {
-                Console.WriteLine("At least one path is required!");
-                return null;
-            }
-
-            return options;
-        }
-
-        /// <summary>
-        /// Display help text
-        /// </summary>
-        public static void DisplayHelp()
-        {
-            Console.WriteLine("Information Printing Program");
-            Console.WriteLine();
-            Console.WriteLine("InfoPrint <options> file|directory ...");
-            Console.WriteLine();
-            Console.WriteLine("Options:");
-            Console.WriteLine("-?, -h, --help           Display this help text and quit");
-            Console.WriteLine("-d, --debug              Enable debug mode");
-            Console.WriteLine("-c, --hash               Output file hashes");
-            Console.WriteLine("-f, --file               Print to file only");
-#if NETCOREAPP
-            Console.WriteLine("-j, --json               Print info as JSON");
-#endif
-        }
-    }
-}

InfoPrint/Program.cs

@@ -1,10 +1,8 @@
 using System;
-using System.IO;
-using System.Text;
-using SabreTools.Hashing;
-using SabreTools.IO.Extensions;
-using SabreTools.Serialization;
-using SabreTools.Serialization.Wrappers;
+using System.Collections.Generic;
+using InfoPrint.Features;
+using SabreTools.CommandLine;
+using SabreTools.CommandLine.Features;
 
 namespace InfoPrint
 {
@@ -12,199 +10,69 @@ namespace InfoPrint
     {
         public static void Main(string[] args)
         {
-            // Get the options from the arguments
-            var options = Options.ParseOptions(args);
+            // Create the command set
+            var mainFeature = new MainFeature();
+            var commandSet = CreateCommands(mainFeature);
 
-            // If we have an invalid state
-            if (options == null)
+            // If we have no args, show the help and quit
+            if (args is null || args.Length == 0)
             {
-                Options.DisplayHelp();
+                commandSet.OutputAllHelp();
                 return;
             }
 
-            // Loop through the input paths
-            foreach (string inputPath in options.InputPaths)
+            // Cache the first argument and starting index
+            string featureName = args[0];
+
+            // Try processing the standalone arguments
+            var topLevel = commandSet.GetTopLevel(featureName);
+            switch (topLevel)
             {
-                PrintPathInfo(inputPath, options);
+                // Standalone Options
+                case Help help: help.ProcessArgs(args, 0, commandSet); return;
+
+                // Default Behavior
+                default:
+                    if (!mainFeature.ProcessArgs(args, 0))
+                    {
+                        commandSet.OutputAllHelp();
+                        return;
+                    }
+                    else if (!mainFeature.VerifyInputs())
+                    {
+                        Console.Error.WriteLine("At least one input is required");
+                        commandSet.OutputAllHelp();
+                        return;
+                    }
+
+                    mainFeature.Execute();
+                    break;
             }
         }
 
         /// <summary>
-        /// Wrapper to print information for a single path
+        /// Create the command set for the program
         /// </summary>
-        /// <param name="path">File or directory path</param>
-        /// <param name="options">User-defined options</param>
-        private static void PrintPathInfo(string path, Options options)
+        private static CommandSet CreateCommands(MainFeature mainFeature)
         {
-            Console.WriteLine($"Checking possible path: {path}");
+            List<string> header = [
+                "Information Printing Program",
+                string.Empty,
+                "InfoPrint <options> file|directory ...",
+                string.Empty,
+            ];
 
-            // Check if the file or directory exists
-            if (File.Exists(path))
-            {
-                PrintFileInfo(path, options);
-            }
-            else if (Directory.Exists(path))
-            {
-                foreach (string file in IOExtensions.SafeEnumerateFiles(path, "*", SearchOption.AllDirectories))
-                {
-                    PrintFileInfo(file, options);
-                }
-            }
-            else
-            {
-                Console.WriteLine($"{path} does not exist, skipping...");
-            }
-        }
-
-        /// <summary>
-        /// Print information for a single file, if possible
-        /// </summary>
-        /// <param name="file">File path</param>
-        /// <param name="options">User-defined options</param>
-        private static void PrintFileInfo(string file, Options options)
-        {
-            Console.WriteLine($"Attempting to print info for {file}");
-
-            // Get the base info output name
-            string filenameBase = $"info-{DateTime.Now:yyyy-MM-dd_HHmmss.ffff}";
-
-            // If we have the hash flag
-            if (options.Hash)
-            {
-                var hashBuilder = PrintHashInfo(file, options.Debug);
-                if (hashBuilder != null)
-                {
-                    // Create the output data
-                    string hashData = hashBuilder.ToString();
-
-                    // Write the output data
-                    using var hsw = new StreamWriter(File.OpenWrite($"{filenameBase}.hashes"));
-                    hsw.WriteLine(hashData);
-                    hsw.Flush();
-                }
-            }
-
-            try
-            {
-                using Stream stream = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-
-                // Read the first 8 bytes
-                byte[]? magic = stream.ReadBytes(8);
-                stream.Seek(0, SeekOrigin.Begin);
-
-                // Get the file type
-                string extension = Path.GetExtension(file).TrimStart('.');
-                WrapperType ft = WrapperFactory.GetFileType(magic ?? [], extension);
-
-                // Print out the file format
-                Console.WriteLine($"File format found: {ft}");
-
-                // Setup the wrapper to print
-                var wrapper = WrapperFactory.CreateWrapper(ft, stream);
-
-                // If we don't have a wrapper
-                if (wrapper == null)
-                {
-                    Console.WriteLine($"Either {ft} is not supported or something went wrong during parsing!");
-                    Console.WriteLine();
-                    return;
-                }
+            var commandSet = new CommandSet(header);
 
+            commandSet.Add(new Help(["-?", "-h", "--help"]));
+            commandSet.Add(mainFeature.DebugInput);
+            commandSet.Add(mainFeature.HashInput);
+            commandSet.Add(mainFeature.FileOnlyInput);
 #if NETCOREAPP
-                // If we have the JSON flag
-                if (options.Json)
-                {
-                    // Create the output data
-                    string serializedData = wrapper.ExportJSON();
-
-                    // Write the output data
-                    using var jsw = new StreamWriter(File.OpenWrite($"{filenameBase}.json"));
-                    jsw.WriteLine(serializedData);
-                    jsw.Flush();
-                }
+            commandSet.Add(mainFeature.JsonInput);
 #endif
 
-                // Create the output data
-                var builder = wrapper.ExportStringBuilder();
-                if (builder == null)
-                {
-                    Console.WriteLine("No item information could be generated");
-                    return;
-                }
-
-                // Only print to console if enabled
-                if (!options.FileOnly)
-                    Console.WriteLine(builder);
-
-                using var sw = new StreamWriter(File.OpenWrite($"{filenameBase}.txt"));
-                sw.WriteLine(file);
-                sw.WriteLine();
-                sw.WriteLine(builder.ToString());
-                sw.Flush();
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(options.Debug ? ex : "[Exception opening file, please try again]");
-                Console.WriteLine();
-            }
-        }
-
-        /// <summary>
-        /// Print hash information for a single file, if possible
-        /// </summary>
-        /// <param name="file">File path</param>
-        /// <param name="debug">Enable debug output</param>
-        /// <returns>StringBuilder representing the hash information, if possible</returns>
-        private static StringBuilder? PrintHashInfo(string file, bool debug)
-        {
-            // Ignore missing files
-            if (!File.Exists(file))
-                return null;
-
-            Console.WriteLine($"Attempting to hash {file}, this may take a while...");
-
-            try
-            {
-                // Get all file hashes for flexibility
-                var hashes = HashTool.GetFileHashes(file);
-                if (hashes == null)
-                {
-                    if (debug) Console.WriteLine($"Hashes for {file} could not be retrieved");
-                    return null;
-                }
-
-                // Output subset of available hashes
-                var builder = new StringBuilder();
-                if (hashes.TryGetValue(HashType.CRC16, out string? crc16) && crc16 != null)
-                    builder.AppendLine($"CRC-16 checksum: {crc16}");
-                if (hashes.TryGetValue(HashType.CRC32, out string? crc32) && crc32 != null)
-                    builder.AppendLine($"CRC-32 checksum: {crc32}");
-                if (hashes.TryGetValue(HashType.MD2, out string? md2) && md2 != null)
-                    builder.AppendLine($"MD2 hash: {md2}");
-                if (hashes.TryGetValue(HashType.MD4, out string? md4) && md4 != null)
-                    builder.AppendLine($"MD4 hash: {md4}");
-                if (hashes.TryGetValue(HashType.MD5, out string? md5) && md5 != null)
-                    builder.AppendLine($"MD5 hash: {md5}");
-                if (hashes.TryGetValue(HashType.RIPEMD128, out string? ripemd128) && ripemd128 != null)
-                    builder.AppendLine($"RIPEMD-128 hash: {ripemd128}");
-                if (hashes.TryGetValue(HashType.RIPEMD160, out string? ripemd160) && ripemd160 != null)
-                    builder.AppendLine($"RIPEMD-160 hash: {ripemd160}");
-                if (hashes.TryGetValue(HashType.SHA1, out string? sha1) && sha1 != null)
-                    builder.AppendLine($"SHA-1 hash: {sha1}");
-                if (hashes.TryGetValue(HashType.SHA256, out string? sha256) && sha256 != null)
-                    builder.AppendLine($"SHA-256 hash: {sha256}");
-                if (hashes.TryGetValue(HashType.SHA384, out string? sha384) && sha384 != null)
-                    builder.AppendLine($"SHA-384 hash: {sha384}");
-                if (hashes.TryGetValue(HashType.SHA512, out string? sha512) && sha512 != null)
-                    builder.AppendLine($"SHA-512 hash: {sha512}");
-
-                return builder;
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(debug ? ex : "[Exception opening file, please try again]");
-                return null;
-            }
+            return commandSet;
         }
     }
 }

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018-2025 Matt Nadareski
+Copyright (c) 2018-2026 Matt Nadareski
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.MD

@@ -2,20 +2,10 @@
 
 [![Build and Test](https://github.com/SabreTools/SabreTools.Serialization/actions/workflows/build_and_test.yml/badge.svg)](https://github.com/SabreTools/SabreTools.Serialization/actions/workflows/build_and_test.yml)
 
-This library comprises of serializers that both read and write from files and streams to the dedicated models as well as convert to and from the common internal models. This library is partially used by the current parsing and writing code but none of the internal model serialization is used.
+This meta-library comprises of serializers that both read and write from files and streams to the dedicated models as well as convert to and from the common internal models. This library is partially used by the current parsing and writing code but none of the internal model serialization is used.
 
 Find the link to the Nuget package [here](https://www.nuget.org/packages/SabreTools.Serialization).
 
-The following non-project libraries (or ports thereof) are used for file handling:
-
-- [GrindCore.SharpCompress](https://github.com/Nanook/GrindCore.SharpCompress) - Common archive format extraction
-- [StormLibSharp](https://github.com/robpaveza/stormlibsharp) - MoPaQ extraction [Unused in .NET Framework 2.0/3.5/4.0 and non-Windows builds due to Windows-specific libraries]
-
-The following projects have influenced this library:
-
-- [libmspack](https://github.com/kyz/libmspack) - Documentation around the MS-CAB format and associated compression methods.
-- [Unshield](https://github.com/twogood/unshield/) - InstallShield CAB extraction tool that influenced internal handling
-
 ## Releases
 
 For the most recent stable build, download the latest release here: [Releases Page](https://github.com/SabreTools/SabreTools.Serialization/releases)
@@ -24,17 +14,18 @@ For the latest WIP build here: [Rolling Release](https://github.com/SabreTools/S
 
 ## InfoPrint
 
-**InfoPrint** is a reference implementation for the deserialization and printing features of the library, packaged as a standalone executable for all supported platforms. It will attempt to detect and display information about many supported file types, optionally both hashing the file and outputting the information to a JSON file (.NET Core 3.1 and above only).
+**InfoPrint** is a reference implementation for the deserialization and printing features of the library, packaged as a standalone executable for all supported platforms. It will attempt to detect and display information about many supported file types, optionally both hashing the file and outputting the information to a JSON file.
 
 ```text
 InfoPrint <options> file|directory ...
 
 Options:
--?, -h, --help           Display this help text and quit
+-?, -h, --help           Display this help text
 -d, --debug              Enable debug mode
 -c, --hash               Output file hashes
 -f, --file               Print to file only
 -j, --json               Print info as JSON
+-r, --recursive          Recursively print info from embedded files
 ```
 
 ## ExtractionTool
@@ -42,10 +33,10 @@ Options:
 **ExtractionTool** is a reference implementation for the extraction features of the library, packaged as a standalone executable for all supported platforms. It will attempt to detect and extract many supported file types. See the table below for supported extraction functionality.
 
 ```text
-ExtractionTool.exe <options> file|directory ...
+ExtractionTool <options> file|directory ...
 
 Options:
--?, -h, --help           Display this help text and quit
+-?, -h, --help           Display this help text
 -d, --debug              Enable debug mode
 -o, --outdir [PATH]      Set output path for extraction (required)
 ```
@@ -53,9 +44,12 @@ Options:
 | Format Name | Notes |
 | --- | --- |
 | 7-zip archive | .NET Framework 4.6.2 and greater |
+| Atari 7800 (A78) Cart Image | Header and ROM data |
+| Atari Lynx (LNX) Cart Image | Header and ROM data |
 | BFPK custom archive format | |
 | bzip2 archive | .NET Framework 4.6.2 and greater |
-| Compound File Binary (CFB) | Only CFB common pieces extractable. .NET Framework 4.0 and greater |
+| Compound File Binary (CFB) | Only CFB common pieces extractable |
+| fwNES FDS file | Header and disk data |
 | gzip archive | |
 | Half-Life Game Cache File (GCF) | |
 | Half-Life Level (BSP) | |
@@ -64,10 +58,12 @@ Options:
 | Half-Life 2 Level (VBSP) | |
 | InstallShield Archive V3 (Z) | |
 | InstallShield CAB | |
+| ISO9660 | ISO and BIN files |
 | Microsoft cabinet file | Does not support LZX or Quantum compression |
 | Microsoft LZ-compressed files | KWAJ, QBasic, and SZDD variants |
-| MoPaQ game data archive (MPQ) | Windows only. .NET Framework 4.5.2 and above |
+| MoPaQ game data archive (MPQ) | Windows only |
 | New Exectuable | Embedded archives and executables in the overlay and Wise installer |
+| Nintendo Entertainment System (NES) Cart Image | Header, Trainer data, PRG-ROM, CHR-ROM, Unheadered ROM, and PlayChoice-10 INST-ROM |
 | NovaLogic Game Archive Format (PFF) | |
 | PKZIP and derived files (ZIP, etc.) | .NET Framework 4.6.2 and greater |
 | Portable Executable | Embedded archives and executables in the resources and overlay, CExe-packed data, SFX archives (7-zip, PKZIP, and RAR), and Wise installer |
@@ -77,46 +73,22 @@ Options:
 | Tape archive (TAR) | |
 | Valve Package File (VPK) | |
 | XBox Package File (XZP) | |
+| Xbox DVD Filesystem (XISO) | |
 | xz archive (XZ) | .NET Framework 4.6.2 and greater |
-
-## Interfaces
-
-Below is a table representing the various conversion interfaces that are implemented within this library.
-
-| Interface Name | Source Type | Destination Type |
-| --- | --- | --- |
-| `SabreTools.Serialization.Interfaces.IByteReader<TModel>` | `byte[]?` | `TModel` |
-| `SabreTools.Serialization.Interfaces.IByteWriter<TModel>` | `TModel` | `byte[]?` |
-| `SabreTools.Serialization.Interfaces.ICrossModel<TSource, TDest>` | `TSource`/`TDest` | `TDest`/`TSource` |
-| `SabreTools.Serialization.Interfaces.IFileReader<TModel>` | `string?` path | `TModel` |
-| `SabreTools.Serialization.Interfaces.IFileWriter<TModel>` | `TModel` | `string?` path |
-| `SabreTools.Serialization.Interfaces.IStreamReader<TModel>` | `Stream?` | `TModel` |
-| `SabreTools.Serialization.Interfaces.IStreamWriter<TModel>` | `TModel` | `Stream?` |
-| `SabreTools.Serialization.Interfaces.IStringReader<TModel>` | `string?` representation | `TModel` |
-| `SabreTools.Serialization.Interfaces.IStringWriter<TModel>` | `TModel` | `string?` representation |
-
-Below is a table representing the various non-conversion interfaces that are implemented within this library.
-
-| Interface Name | Purpose |
-| --- | --- |
-| `SabreTools.Data.Printers.IPrinter<TModel>` | Provides a formatted output for a `TModel` |
-| `SabreTools.Serialization.Wrappers.IExtractable` | Marks a wrapper as able to be extracted |
-| `SabreTools.Serialization.Wrappers.IWrapper` | Represents an item with a description and JSON serializable state, allowing for extensions |
-| `SabreTools.Serialization.Wrappers.IWrapper<TModel>` | Wraps a model with source data, allowing for extensions |
+| ZArchive | |
 
 ## Namespaces
 
-Below is a table of all namespaces within the library and what they represent
+Below are a list of the included namespaces with links to their README files:
 
-| Namespace | Description |
-| --- | --- |
-| `SabreTools.Data.Attributes` | Common attributes for data marking and manipulation |
-| `SabreTools.Data.Extensions` | Extension methods related to models |
-| `SabreTools.Data.Models` | Models representing different file and structure types |
-| `SabreTools.Data.ObjectIdentifier` | Object Identifier (OID) parsing |
-| `SabreTools.Data.Printers` | Export model information in a formatted manner |
-| `SabreTools.Serialization.CrossModel` | Convert between models; mainly used for metadata files converting to and from a common, `Dictionary`-based model |
-| `SabreTools.Serialization.Interfaces` | Interfaces used commonly throughout the library |
-| `SabreTools.Serialization.Readers` | Convert from external sources to models |
-| `SabreTools.Serialization.Wrappers` | Classes that wrap serialization and models to allow for including extension properties |
-| `SabreTools.Serialization.Writers` | Convert from models to external sources |
+- [SabreTools.Data.Extensions](https://github.com/SabreTools/SabreTools.Serialization/tree/main/SabreTools.Data.Extensions)
+- [SabreTools.Data.Models](https://github.com/SabreTools/SabreTools.Serialization/tree/main/SabreTools.Data.Models)
+- [SabreTools.Metadata.DatFiles](https://github.com/SabreTools/SabreTools.Serialization/tree/main/SabreTools.Metadata.DatFiles)
+- [SabreTools.Metadata.DatItems](https://github.com/SabreTools/SabreTools.Serialization/tree/main/SabreTools.Metadata.Datitems)
+- [SabreTools.Metadata.Filter](https://github.com/SabreTools/SabreTools.Serialization/tree/main/SabreTools.Metadata.Filter)
+- [SabreTools.Metadata.Reports](https://github.com/SabreTools/SabreTools.Serialization/tree/main/SabreTools.Metadata.Reports)
+- [SabreTools.ObjectIdentifier](https://github.com/SabreTools/SabreTools.Serialization/tree/main/SabreTools.ObjectIdentifier)
+- [SabreTools.Serialization.CrossModel](https://github.com/SabreTools/SabreTools.Serialization/tree/main/SabreTools.Serialization.CrossModel)
+- [SabreTools.Serialization.Readers](https://github.com/SabreTools/SabreTools.Serialization/tree/main/SabreTools.Serialization.Readers)
+- [SabreTools.Serialization.Writers](https://github.com/SabreTools/SabreTools.Serialization/tree/main/SabreTools.Serialization.Writers)
+- [SabreTools.Wrappers](https://github.com/SabreTools/SabreTools.Serialization/tree/main/SabreTools.Wrappers)

SabreTools.Data.Extensions.Test/Atari7800CartExtensionsTests.cs

@@ -0,0 +1,141 @@
+using SabreTools.Data.Models.Atari7800;
+using Xunit;
+
+namespace SabreTools.Data.Extensions.Test
+{
+    public class Atari7800CartExtensionsTests
+    {
+        [Theory]
+        [InlineData((AudioDevice)0, "POKEY - none, No YM2151 @460, No COVOX @430, No ADPCM Audio Stream @420")]
+        // POKEY
+        [InlineData(AudioDevice.Pokey440, "POKEY - @440, No YM2151 @460, No COVOX @430, No ADPCM Audio Stream @420")]
+        [InlineData(AudioDevice.Pokey450, "POKEY - @450, No YM2151 @460, No COVOX @430, No ADPCM Audio Stream @420")]
+        [InlineData(AudioDevice.Pokey450Plus440, "POKEY - @450+@440, No YM2151 @460, No COVOX @430, No ADPCM Audio Stream @420")]
+        [InlineData(AudioDevice.Pokey800, "POKEY - @800, No YM2151 @460, No COVOX @430, No ADPCM Audio Stream @420")]
+        [InlineData(AudioDevice.Pokey4000, "POKEY - @4000, No YM2151 @460, No COVOX @430, No ADPCM Audio Stream @420")]
+        [InlineData((AudioDevice)0x0007, "Unknown 7, No YM2151 @460, No COVOX @430, No ADPCM Audio Stream @420")]
+        // YM2151
+        [InlineData(AudioDevice.YM2151460, "POKEY - none, YM2151 @460, No COVOX @430, No ADPCM Audio Stream @420")]
+        // COVOX
+        [InlineData(AudioDevice.COVOX430, "POKEY - none, No YM2151 @460, COVOX @430, No ADPCM Audio Stream @420")]
+        // ADPCM
+        [InlineData(AudioDevice.ADPCMAudioStream420, "POKEY - none, No YM2151 @460, No COVOX @430, ADPCM Audio Stream @420")]
+        public void FromAudioDeviceTest(AudioDevice audio, string expected)
+        {
+            string actual = audio.FromAudioDevice();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData((CartType)0, "N/A")]
+        [InlineData(CartType.PokeyAt4000, "pokey at $4000")]
+        [InlineData(CartType.SupergameBankSwitched, "supergame bank switched")]
+        [InlineData(CartType.SupergameRamAt4000, "supergame ram at $4000")]
+        [InlineData(CartType.RomAt4000, "rom at $4000")]
+        [InlineData(CartType.Bank6At4000, "bank 6 at $4000")]
+        [InlineData(CartType.BankedRam, "banked ram")]
+        [InlineData(CartType.PokeyAt450, "pokey at $450")]
+        [InlineData(CartType.MirrorRamAt4000, "mirror ram at $4000")]
+        [InlineData(CartType.ActivisionBanking, "activision banking")]
+        [InlineData(CartType.AbsoluteBanking, "absolute banking")]
+        [InlineData(CartType.PokeyAt440, "pokey at $440")]
+        [InlineData(CartType.Ym2151At460461, "ym2151 at $460/$461")]
+        [InlineData(CartType.Souper, "souper")]
+        [InlineData(CartType.Banksets, "banksets")]
+        [InlineData(CartType.HaltBankedRam, "halt banked ram")]
+        [InlineData(CartType.PokeyAt800, "pokey@800")]
+        public void FromCartTypeTest(CartType type, string expected)
+        {
+            string actual = type.FromCartType();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(ControllerType.None, "none")]
+        [InlineData(ControllerType.Joystick, "7800 joystick")]
+        [InlineData(ControllerType.Lightgun, "lightgun")]
+        [InlineData(ControllerType.Paddle, "paddle")]
+        [InlineData(ControllerType.Trakball, "trakball")]
+        [InlineData(ControllerType.VcsJoystick, "2600 joystick")]
+        [InlineData(ControllerType.VcsDriving, "2600 driving")]
+        [InlineData(ControllerType.VcsKeypad, "2600 keypad")]
+        [InlineData(ControllerType.STMouse, "ST mouse")]
+        [InlineData(ControllerType.AmigaMouse, "Amiga mouse")]
+        [InlineData(ControllerType.AtariVoxSaveKey, "AtariVox/SaveKey")]
+        [InlineData(ControllerType.SNES2Atari, "SNES2Atari")]
+        [InlineData(ControllerType.Mega7800, "Mega7800")]
+        public void FromControllerTypeTest(ControllerType type, string expected)
+        {
+            string actual = type.FromControllerType();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(Interrupt.None, "None")]
+        [InlineData(Interrupt.Pokey1, "POKEY 1 (@450 | @800 | @4000)")]
+        [InlineData(Interrupt.Pokey2, "POKEY 2 (@440)")]
+        [InlineData(Interrupt.YM2151, "YM2151")]
+        public void FromInterruptTest(Interrupt interrupt, string expected)
+        {
+            string actual = interrupt.FromInterrupt();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(Mapper.Linear, "Linear")]
+        [InlineData(Mapper.SuperGame, "SuperGame")]
+        [InlineData(Mapper.Activision, "Activision")]
+        [InlineData(Mapper.Absolute, "Absolute")]
+        [InlineData(Mapper.Souper, "Souper")]
+        public void FromMapperTest(Mapper mapper, string expected)
+        {
+            string actual = mapper.FromMapper();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(MapperOptions.SuperGameNone, "Option at @4000 - none, Standard ROM")]
+        [InlineData(MapperOptions.SuperGame16KRAM, "Option at @4000 - 16K RAM, Standard ROM")]
+        [InlineData(MapperOptions.SuperGame8KEXRAMA8, "Option at @4000 - 8K EXRAM/A8, Standard ROM")]
+        [InlineData(MapperOptions.SuperGame32KEXRAMM2, "Option at @4000 - 32K EXRAM/M2, Standard ROM")]
+        [InlineData(MapperOptions.SuperGameEXROM, "Option at @4000 - EXROM, Standard ROM")]
+        [InlineData(MapperOptions.SuperGameEXFIX, "Option at @4000 - EXFIX, Standard ROM")]
+        [InlineData(MapperOptions.SuperGame32KEXRAMX2, "Option at @4000 - 32k EXRAM/X2, Standard ROM")]
+        [InlineData(MapperOptions.BanksetRom, "Option at @4000 - none, Bankset ROM")]
+        public void FromMapperOptionsTest(MapperOptions options, string expected)
+        {
+            string actual = options.FromMapperOptions();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(SaveDevice.None, "None")]
+        [InlineData(SaveDevice.HSC, "HSC")]
+        [InlineData(SaveDevice.SaveKeyAtariVox, "SaveKey/AtariVox")]
+        public void FromSaveDeviceTest(SaveDevice device, string expected)
+        {
+            string actual = device.FromSaveDevice();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(SlotPassthroughDevice.None, "None")]
+        [InlineData(SlotPassthroughDevice.XM, "XM")]
+        public void FromSlotPassthroughDeviceTest(SlotPassthroughDevice device, string expected)
+        {
+            string actual = device.FromSlotPassthroughDevice();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData((TVType)0, "NTSC, Component, Single-region")]
+        [InlineData(TVType.PAL, "PAL, Component, Single-region")]
+        [InlineData(TVType.Composite, "NTSC, Composite, Single-region")]
+        [InlineData(TVType.MultiRegion, "NTSC, Component, Multi-region")]
+        public void FromTVTypeTest(TVType type, string expected)
+        {
+            string actual = type.FromTVType();
+            Assert.Equal(expected, actual);
+        }
+    }
+}

SabreTools.Data.Extensions.Test/AtariLynxCartExtensionsTests.cs

@@ -0,0 +1,18 @@
+using SabreTools.Data.Models.AtariLynx;
+using Xunit;
+
+namespace SabreTools.Data.Extensions.Test
+{
+    public class AtariLynxCartExtensionsTests
+    {
+        [Theory]
+        [InlineData(Rotation.NoRotation, "No rotation (horizontal, buttons right)")]
+        [InlineData(Rotation.RotateLeft, "Rotate left (vertical, buttons down)")]
+        [InlineData(Rotation.RotateRight, "Rotate right (vertical, buttons up)")]
+        public void FromRotationTest(Rotation rotation, string expected)
+        {
+            string actual = rotation.FromRotation();
+            Assert.Equal(expected, actual);
+        }
+    }
+}

SabreTools.Data.Extensions.Test/CDROMExtensionsTests.cs

@@ -0,0 +1,65 @@
+using System.IO;
+using SabreTools.Data.Models.CDROM;
+using Xunit;
+
+namespace SabreTools.Data.Extensions.Test
+{
+    public class CDROMExtensionsTests
+    {
+        [Theory]
+        [InlineData(new byte[0], SectorMode.UNKNOWN)]
+        [InlineData(new byte[] { 0x00 }, SectorMode.MODE0)]
+        [InlineData(new byte[] { 0x01 }, SectorMode.MODE1)]
+        [InlineData(new byte[] { 0x02 }, SectorMode.UNKNOWN)]
+        [InlineData(new byte[] { 0x02, 0x00, 0x00, 0x00 }, SectorMode.MODE2_FORM1)]
+        [InlineData(new byte[] { 0x02, 0x00, 0x00, 0x20 }, SectorMode.MODE2_FORM2)]
+        [InlineData(new byte[] { 0x03 }, SectorMode.UNKNOWN)]
+        public void GetSectorModeTest(byte[] bytes, SectorMode expected)
+        {
+            var stream = new MemoryStream(bytes);
+            SectorMode actual = stream.GetSectorMode();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(SectorMode.UNKNOWN, 2336)]
+        [InlineData(SectorMode.MODE0, 2336)]
+        [InlineData(SectorMode.MODE1, 2048)]
+        [InlineData(SectorMode.MODE2, 2336)]
+        [InlineData(SectorMode.MODE2_FORM1, 2048)]
+        [InlineData(SectorMode.MODE2_FORM2, 2324)]
+        public void GetUserDataSizeTest(SectorMode mode, long expected)
+        {
+            long actual = mode.GetUserDataSize();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(SectorMode.UNKNOWN, 2064)]
+        [InlineData(SectorMode.MODE0, 2064)]
+        [InlineData(SectorMode.MODE1, 2064)]
+        [InlineData(SectorMode.MODE2, 2064)]
+        [InlineData(SectorMode.MODE2_FORM1, 2072)]
+        [InlineData(SectorMode.MODE2_FORM2, 2072)]
+        public void GetUserDataEndTest(SectorMode mode, long expected)
+        {
+            long actual = mode.GetUserDataEnd();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(SectorMode.UNKNOWN, 16)]
+        [InlineData(SectorMode.MODE0, 16)]
+        [InlineData(SectorMode.MODE1, 16)]
+        [InlineData(SectorMode.MODE2, 16)]
+        [InlineData(SectorMode.MODE2_FORM1, 24)]
+        [InlineData(SectorMode.MODE2_FORM2, 24)]
+        public void GetUserDataStart(SectorMode mode, long expected)
+        {
+            long actual = mode.GetUserDataStart();
+            Assert.Equal(expected, actual);
+        }
+
+        // TODO: Figure out how to add UserDataStream tests
+    }
+}

SabreTools.Data.Extensions.Test/CFBExtensionsTests.cs

@@ -0,0 +1,17 @@
+using Xunit;
+
+namespace SabreTools.Data.Extensions.Test
+{
+    public class CFBExtensionsTests
+    {
+        [Theory]
+        [InlineData(null, null)]
+        [InlineData(new byte[0], "")]
+        // TODO: Create more artifical tests
+        public void DecodeStreamNameTest(byte[]? bytes, string? expected)
+        {
+            string? actual = bytes.DecodeStreamName();
+            Assert.Equal(expected, actual);
+        }
+    }
+}

SabreTools.Data.Extensions.Test/ISO9660ExtensionsTests.cs

@@ -0,0 +1,138 @@
+using SabreTools.Data.Models.ISO9660;
+using SabreTools.Numerics;
+using Xunit;
+
+namespace SabreTools.Data.Extensions.Test
+{
+    public class ISO9660ExtensionsTests
+    {
+        [Fact]
+        public void GetLogicalBlockSize_Generic_SectorLength()
+        {
+            VolumeDescriptor vd = new GenericVolumeDescriptor();
+            short sectorLength = 4096;
+            short actual = vd.GetLogicalBlockSize(sectorLength);
+            Assert.Equal(sectorLength, actual);
+        }
+
+        [Fact]
+        public void GetLogicalBlockSize_PVD_ValidBothEndian_ValidBlockSize_BlockSize()
+        {
+            VolumeDescriptor vd = new PrimaryVolumeDescriptor
+            {
+                LogicalBlockSize = new BothInt16(2048, 2048)
+            };
+            short sectorLength = 4096;
+            short actual = vd.GetLogicalBlockSize(sectorLength);
+            Assert.Equal(2048, actual);
+        }
+
+        [Fact]
+        public void GetLogicalBlockSize_PVD_ValidBothEndian_InvalidBlockSize_SectorLength()
+        {
+            VolumeDescriptor vd = new PrimaryVolumeDescriptor
+            {
+                LogicalBlockSize = new BothInt16(2352, 2352)
+            };
+            short sectorLength = 4096;
+            short actual = vd.GetLogicalBlockSize(sectorLength);
+            Assert.Equal(4096, actual);
+        }
+
+        [Fact]
+        public void GetLogicalBlockSize_PVD_InvalidBothEndian_ValidLE_LEValue()
+        {
+            VolumeDescriptor vd = new PrimaryVolumeDescriptor
+            {
+                LogicalBlockSize = new BothInt16(2048, -1)
+            };
+            short sectorLength = 4096;
+            short actual = vd.GetLogicalBlockSize(sectorLength);
+            Assert.Equal(2048, actual);
+        }
+
+        [Fact]
+        public void GetLogicalBlockSize_PVD_InvalidBothEndian_ValidBE_BEValue()
+        {
+            VolumeDescriptor vd = new PrimaryVolumeDescriptor
+            {
+                LogicalBlockSize = new BothInt16(-1, 2048)
+            };
+            short sectorLength = 4096;
+            short actual = vd.GetLogicalBlockSize(sectorLength);
+            Assert.Equal(2048, actual);
+        }
+
+        [Fact]
+        public void GetLogicalBlockSize_PVD_InvalidBothEndian_BothInvalid_SectorLength()
+        {
+            VolumeDescriptor vd = new PrimaryVolumeDescriptor
+            {
+                LogicalBlockSize = new BothInt16(-1, -2)
+            };
+            short sectorLength = 4096;
+            short actual = vd.GetLogicalBlockSize(sectorLength);
+            Assert.Equal(sectorLength, actual);
+        }
+
+        [Fact]
+        public void GetLogicalBlockSize_SVD_ValidBothEndian_ValidBlockSize_BlockSize()
+        {
+            VolumeDescriptor vd = new SupplementaryVolumeDescriptor
+            {
+                LogicalBlockSize = new BothInt16(2048, 2048)
+            };
+            short sectorLength = 4096;
+            short actual = vd.GetLogicalBlockSize(sectorLength);
+            Assert.Equal(2048, actual);
+        }
+
+        [Fact]
+        public void GetLogicalBlockSize_SVD_ValidBothEndian_InvalidBlockSize_SectorLength()
+        {
+            VolumeDescriptor vd = new SupplementaryVolumeDescriptor
+            {
+                LogicalBlockSize = new BothInt16(2352, 2352)
+            };
+            short sectorLength = 4096;
+            short actual = vd.GetLogicalBlockSize(sectorLength);
+            Assert.Equal(4096, actual);
+        }
+
+        [Fact]
+        public void GetLogicalBlockSize_SVD_InvalidBothEndian_ValidLE_LEValue()
+        {
+            VolumeDescriptor vd = new SupplementaryVolumeDescriptor
+            {
+                LogicalBlockSize = new BothInt16(2048, -1)
+            };
+            short sectorLength = 4096;
+            short actual = vd.GetLogicalBlockSize(sectorLength);
+            Assert.Equal(2048, actual);
+        }
+
+        [Fact]
+        public void GetLogicalBlockSize_SVD_InvalidBothEndian_ValidBE_BEValue()
+        {
+            VolumeDescriptor vd = new SupplementaryVolumeDescriptor
+            {
+                LogicalBlockSize = new BothInt16(-1, 2048)
+            };
+            short sectorLength = 4096;
+            short actual = vd.GetLogicalBlockSize(sectorLength);
+            Assert.Equal(2048, actual);
+        }
+
+        [Fact]
+        public void GetLogicalBlockSize_SVD_InvalidBothEndian_BothInvalid_SectorLength()
+        {
+            VolumeDescriptor vd = new SupplementaryVolumeDescriptor
+            {
+                LogicalBlockSize = new BothInt16(-1, -2)
+            };
+            short sectorLength = 4096;
+            short actual = vd.GetLogicalBlockSize(sectorLength);
+            Assert.Equal(sectorLength, actual);
+        }
+    }
+}

SabreTools.Data.Extensions.Test/InstallShieldCabinetExtensionsTests.cs

@@ -0,0 +1,156 @@
+using SabreTools.Data.Models.InstallShieldCabinet;
+using Xunit;
+
+namespace SabreTools.Data.Extensions.Test
+{
+    public class InstallShieldCabinetExtensionsTests
+    {
+        #region IsCompressed
+
+        [Fact]
+        public void IsCompressed_Null_True()
+        {
+            FileDescriptor? fd = null;
+            bool actual = fd.IsCompressed();
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void IsCompressed_Compressed_True()
+        {
+            FileDescriptor? fd = new FileDescriptor { Flags = FileFlags.FILE_COMPRESSED };
+            bool actual = fd.IsCompressed();
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void IsCompressed_NotCompressed_False()
+        {
+            FileDescriptor? fd = new FileDescriptor { Flags = 0 };
+            bool actual = fd.IsCompressed();
+            Assert.False(actual);
+        }
+
+        #endregion
+
+        #region IsInvalid
+
+        [Fact]
+        public void IsInvalid_Null_True()
+        {
+            FileDescriptor? fd = null;
+            bool actual = fd.IsInvalid();
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void IsInvalid_Invalid_True()
+        {
+            FileDescriptor? fd = new FileDescriptor { Flags = FileFlags.FILE_INVALID };
+            bool actual = fd.IsInvalid();
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void IsInvalid_Valid_False()
+        {
+            FileDescriptor? fd = new FileDescriptor { Flags = 0 };
+            bool actual = fd.IsInvalid();
+            Assert.False(actual);
+        }
+
+        #endregion
+
+        #region IsObfuscated
+
+        [Fact]
+        public void IsObfuscated_Null_False()
+        {
+            FileDescriptor? fd = null;
+            bool actual = fd.IsObfuscated();
+            Assert.False(actual);
+        }
+
+        [Fact]
+        public void IsObfuscated_Obfuscated_True()
+        {
+            FileDescriptor? fd = new FileDescriptor { Flags = FileFlags.FILE_OBFUSCATED };
+            bool actual = fd.IsObfuscated();
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void IsObfuscated_NotObfuscated_False()
+        {
+            FileDescriptor? fd = new FileDescriptor { Flags = 0 };
+            bool actual = fd.IsObfuscated();
+            Assert.False(actual);
+        }
+
+        #endregion
+
+        #region IsSplit
+
+        [Fact]
+        public void IsSplit_Null_False()
+        {
+            FileDescriptor? fd = null;
+            bool actual = fd.IsSplit();
+            Assert.False(actual);
+        }
+
+        [Fact]
+        public void IsSplit_Split_True()
+        {
+            FileDescriptor? fd = new FileDescriptor { Flags = FileFlags.FILE_SPLIT };
+            bool actual = fd.IsSplit();
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void IsSplit_NotSplitFalse()
+        {
+            FileDescriptor? fd = new FileDescriptor { Flags = 0 };
+            bool actual = fd.IsSplit();
+            Assert.False(actual);
+        }
+
+        #endregion
+
+        #region GetMajorVersion
+
+        [Fact]
+        public void GetMajorVersion_NullCabinet_NegativeOne()
+        {
+            Cabinet? cabinet = null;
+            int actual = cabinet.GetMajorVersion();
+            Assert.Equal(-1, actual);
+        }
+
+        [Fact]
+        public void GetMajorVersion_NullHeader_NegativeOne()
+        {
+            CommonHeader? cabinet = null;
+            int actual = cabinet.GetMajorVersion();
+            Assert.Equal(-1, actual);
+        }
+
+        [Theory]
+        [InlineData(0x00000000, 0)]
+        [InlineData(0x00000004, 4)]
+        [InlineData(0x01000000, 0)]
+        [InlineData(0x01004000, 4)]
+        [InlineData(0x02000000, 0)]
+        [InlineData(0x02000190, 4)]
+        [InlineData(0x04000000, 0)]
+        [InlineData(0x04000190, 4)]
+        public void GetMajorVersionTest(uint version, int expected)
+        {
+            CommonHeader? cabinet = new CommonHeader { Version = version };
+            int actual = cabinet.GetMajorVersion();
+            Assert.Equal(expected, actual);
+        }
+
+        #endregion
+    }
+}

SabreTools.Data.Extensions.Test/NESCartExtensionsTests.cs

@@ -0,0 +1,206 @@
+using SabreTools.Data.Models.NES;
+using Xunit;
+
+namespace SabreTools.Data.Extensions.Test
+{
+    public class NESCartExtensionsTests
+    {
+        [Theory]
+        [InlineData(ConsoleType.StandardSystem, "Nintendo Entertainment System/Family Computer")]
+        [InlineData(ConsoleType.VSUnisystem, "VS Unisystem")]
+        [InlineData(ConsoleType.PlayChoice10, "PlayChoice-10 (8 KB of Hint Screen data stored after CHR data)")]
+        [InlineData(ConsoleType.ExtendedConsoleType, "Extended Console Type")]
+        public void FromConsoleTypeTest(ConsoleType type, string expected)
+        {
+            string actual = type.FromConsoleType();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(CPUPPUTiming.RP2C02, "RP2C02 (NTSC NES)")]
+        [InlineData(CPUPPUTiming.RP2C07, "RP2C07 (Licensed PAL NES)")]
+        [InlineData(CPUPPUTiming.MultipleRegion, "Multiple-region")]
+        [InlineData(CPUPPUTiming.UA6538, "UA6538 (Dendy)")]
+        public void FromCPUPPUTimingTest(CPUPPUTiming timing, string expected)
+        {
+            string actual = timing.FromCPUPPUTiming();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(DefaultExpansionDevice.Unspecified, "Unspecified")]
+        [InlineData(DefaultExpansionDevice.StandardControllers, "Standard NES/Famicom controllers")]
+        [InlineData(DefaultExpansionDevice.NESFourScore, "NES Four Score/Satellite with two additional standard controllers")]
+        [InlineData(DefaultExpansionDevice.FamicomFourPlayersAdapter, "Famicom Four Players Adapter with two additional standard controllers using the 'simple' protocol")]
+        [InlineData(DefaultExpansionDevice.VsSystem4016, "Vs. System (1P via $4016)")]
+        [InlineData(DefaultExpansionDevice.VsSystem4017, "Vs. System (1P via $4017)")]
+        [InlineData(DefaultExpansionDevice.Reserved06, "Reserved (0x06)")]
+        [InlineData(DefaultExpansionDevice.VsZapper, "Vs. Zapper")]
+        [InlineData(DefaultExpansionDevice.Zapper4017, "Zapper ($4017)")]
+        [InlineData(DefaultExpansionDevice.TwoZappers, "Two Zappers")]
+        [InlineData(DefaultExpansionDevice.BandaiHyperShotLightgun, "Bandai Hyper Shot Lightgun")]
+        [InlineData(DefaultExpansionDevice.PowerPadSideA, "Power Pad Side A")]
+        [InlineData(DefaultExpansionDevice.PowerPadSideB, "Power Pad Side B")]
+        [InlineData(DefaultExpansionDevice.FamilyTrainerSideA, "Family Trainer Side A")]
+        [InlineData(DefaultExpansionDevice.FamilyTrainerSideB, "Family Trainer Side B")]
+        [InlineData(DefaultExpansionDevice.ArkanoidVausControllerNES, "Arkanoid Vaus Controller (NES)")]
+        [InlineData(DefaultExpansionDevice.ArkanoidVausControllerFamicom, "Arkanoid Vaus Controller (Famicom)")]
+        [InlineData(DefaultExpansionDevice.TwoVausControllersPlusFamicomDataRecorder, "Two Vaus Controllers plus Famicom Data Recorder")]
+        [InlineData(DefaultExpansionDevice.KonamiHyperShotController, "Konami Hyper Shot Controller")]
+        [InlineData(DefaultExpansionDevice.CoconutsPachinkoController, "Coconuts Pachinko Controller")]
+        [InlineData(DefaultExpansionDevice.ExcitingBoxingPunchingBag, "Exciting Boxing Punching Bag (Blowup Doll)")]
+        [InlineData(DefaultExpansionDevice.JissenMahjongController, "Jissen Mahjong Controller")]
+        [InlineData(DefaultExpansionDevice.YonezawaPartyTap, "米澤 (Yonezawa) Party Tap")]
+        [InlineData(DefaultExpansionDevice.OekaKidsTablet, "Oeka Kids Tablet")]
+        [InlineData(DefaultExpansionDevice.SunsoftBarcodeBattler, "Sunsoft Barcode Battler")]
+        [InlineData(DefaultExpansionDevice.MiraclePianoKeyboard, "Miracle Piano Keyboard")]
+        [InlineData(DefaultExpansionDevice.PokkunMoguraaTapTapMat, "Pokkun Moguraa Tap-tap Mat (Whack-a-Mole Mat and Mallet)")]
+        [InlineData(DefaultExpansionDevice.TopRider, "Top Rider (Inflatable Bicycle)")]
+        [InlineData(DefaultExpansionDevice.DoubleFisted, "Double-Fisted (Requires or allows use of two controllers by one player)")]
+        [InlineData(DefaultExpansionDevice.Famicom3DSystem, "Famicom 3D System")]
+        [InlineData(DefaultExpansionDevice.DoremikkoKeyboard, "Doremikko Keyboard")]
+        [InlineData(DefaultExpansionDevice.ROBGyromite, "R.O.B. Gyromite")]
+        [InlineData(DefaultExpansionDevice.FamicomDataRecorder, "Famicom Data Recorder ('silent' keyboard)")]
+        [InlineData(DefaultExpansionDevice.ASCIITurboFile, "ASCII Turbo File")]
+        [InlineData(DefaultExpansionDevice.IGSStorageBattleBox, "IGS Storage Battle Box")]
+        [InlineData(DefaultExpansionDevice.FamilyBASICKeyboardPlusFamicomDataRecorder, "Family BASIC Keyboard plus Famicom Data Recorder")]
+        [InlineData(DefaultExpansionDevice.DongdaPECKeyboard, "东达 (Dōngdá) PEC Keyboard")]
+        [InlineData(DefaultExpansionDevice.BitCorpBit79Keyboard, "普澤 (Pǔzé, a.k.a. Bit Corp.) Bit-79 Keyboard")]
+        [InlineData(DefaultExpansionDevice.SuborKeyboard, "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard")]
+        [InlineData(DefaultExpansionDevice.SuborKeyboardPlusMacroWinnersMouse, "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard plus Macro Winners Mouse")]
+        [InlineData(DefaultExpansionDevice.SuborKeyboardPlusSuborMouse4016, "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard plus Subor Mouse via $4016")]
+        [InlineData(DefaultExpansionDevice.SNESMouse4016, "SNES Mouse ($4016)")]
+        [InlineData(DefaultExpansionDevice.Multicart, "Multicart")]
+        [InlineData(DefaultExpansionDevice.TwoSNESControllers, "Two SNES controllers replacing the two standard NES controllers")]
+        [InlineData(DefaultExpansionDevice.RacerMateBicycle, "RacerMate Bicycle")]
+        [InlineData(DefaultExpansionDevice.UForce, "U-Force")]
+        [InlineData(DefaultExpansionDevice.ROBStackUp, "R.O.B. Stack-Up")]
+        [InlineData(DefaultExpansionDevice.CityPatrolmanLightgun, "City Patrolman Lightgun")]
+        [InlineData(DefaultExpansionDevice.SharpC1CassetteInterface, "Sharp C1 Cassette Interface")]
+        [InlineData(DefaultExpansionDevice.StandardControllerWithSwappedInputs, "Standard Controller with swapped Left-Right/Up-Down/B-A")]
+        [InlineData(DefaultExpansionDevice.ExcaliburSudokuPad, "Excalibur Sudoku Pad")]
+        [InlineData(DefaultExpansionDevice.ABLPinball, "ABL Pinball")]
+        [InlineData(DefaultExpansionDevice.GoldenNuggetCasinoExtraButtons, "Golden Nugget Casino extra buttons")]
+        [InlineData(DefaultExpansionDevice.KedaKeyboard, "科达 (Kēdá) Keyboard")]
+        [InlineData(DefaultExpansionDevice.SuborKeyboardPlusSuborMouse4017, "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard plus Subor Mouse via $4017")]
+        [InlineData(DefaultExpansionDevice.PortTestController, "Port test controller")]
+        [InlineData(DefaultExpansionDevice.BandaiMultiGamePlayerGamepad, "Bandai Multi Game Player Gamepad buttons")]
+        [InlineData(DefaultExpansionDevice.VenomTVDanceMat, "Venom TV Dance Mat")]
+        [InlineData(DefaultExpansionDevice.LGTVRemoteControl, "LG TV Remote Control")]
+        [InlineData(DefaultExpansionDevice.FamicomNetworkController, "Famicom Network Controller")]
+        [InlineData(DefaultExpansionDevice.KingFishingController, "King Fishing Controller")]
+        [InlineData(DefaultExpansionDevice.CroakyKaraokeController, "Croaky Karaoke Controller")]
+        [InlineData(DefaultExpansionDevice.KingwonKeyboard, "科王 (Kēwáng, a.k.a. Kingwon) Keyboard")]
+        [InlineData(DefaultExpansionDevice.ZechengKeyboard, "泽诚 (Zéchéng) Keyboard")]
+        [InlineData(DefaultExpansionDevice.SuborKeyboardPlusL90RotatedPS2Mouse4017, "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard plus L90-rotated PS/2 mouse in $4017")]
+        [InlineData(DefaultExpansionDevice.PS2KeyboardInUM6578PS2PortPS2Mouse4017, "PS/2 Keyboard in UM6578 PS/2 port, PS/2 Mouse via $4017")]
+        [InlineData(DefaultExpansionDevice.PS2MouseInUM6578PS2Port, "PS/2 Mouse in UM6578 PS/2 port")]
+        [InlineData(DefaultExpansionDevice.YuxingMouse4016, "裕兴 (Yùxìng) Mouse via $4016")]
+        [InlineData(DefaultExpansionDevice.SuborKeyboardPlusYuxingMouse4016, "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard plus 裕兴 (Yùxìng) Mouse mouse in $4016")]
+        [InlineData(DefaultExpansionDevice.GigggleTVPump, "Gigggle TV Pump")]
+        [InlineData(DefaultExpansionDevice.BBKKeyboardPlusR90RotatedPS2Mouse4017, "步步高 (Bùbùgāo, a.k.a. BBK) Keyboard plus R90-rotated PS/2 mouse in $4017")]
+        [InlineData(DefaultExpansionDevice.MagicalCooking, "Magical Cooking")]
+        [InlineData(DefaultExpansionDevice.SNESMouse4017, "SNES Mouse ($4017)")]
+        [InlineData(DefaultExpansionDevice.Zapper4016, "Zapper ($4016)")]
+        [InlineData(DefaultExpansionDevice.ArkanoidVausControllerPrototype, "Arkanoid Vaus Controller (Prototype)")]
+        [InlineData(DefaultExpansionDevice.TVMahjongGameController, "TV 麻雀 Game (TV Mahjong Game) Controller")]
+        [InlineData(DefaultExpansionDevice.MahjongGekitouDensetsuController, "麻雀激闘伝説 (Mahjong Gekitou Densetsu) Controller")]
+        [InlineData(DefaultExpansionDevice.SuborKeyboardPlusXInvertedPS2Mouse4017, "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard plus X-inverted PS/2 mouse in $4017")]
+        [InlineData(DefaultExpansionDevice.IBMPCXTKeyboard, "IBM PC/XT Keyboard")]
+        [InlineData(DefaultExpansionDevice.SuborKeyboardPlusMegaBookMouse, "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard plus Mega Book Mouse")]
+        public void FromDefaultExpansionDeviceTest(DefaultExpansionDevice device, string expected)
+        {
+            string actual = device.FromDefaultExpansionDevice();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(ExtendedConsoleType.RegularSystem, "Regular NES/Famicom/Dendy")]
+        [InlineData(ExtendedConsoleType.NintendoVsSystem, "Nintendo Vs. System")]
+        [InlineData(ExtendedConsoleType.Playchoice10, "Playchoice 10")]
+        [InlineData(ExtendedConsoleType.RegularFamicloneDecimalMode, "Regular Famiclone, but with CPU that supports Decimal Mode")]
+        [InlineData(ExtendedConsoleType.RegularNESWithEPSM, "Regular NES/Famicom with EPSM module or plug-through cartridge")]
+        [InlineData(ExtendedConsoleType.VRTechnologyVT01, "V.R. Technology VT01 with red/cyan STN palette")]
+        [InlineData(ExtendedConsoleType.VRTechnologyVT02, "V.R. Technology VT02")]
+        [InlineData(ExtendedConsoleType.VRTechnologyVT03, "V.R. Technology VT03")]
+        [InlineData(ExtendedConsoleType.VRTechnologyVT09, "V.R. Technology VT09")]
+        [InlineData(ExtendedConsoleType.VRTechnologyVT32, "V.R. Technology VT32")]
+        [InlineData(ExtendedConsoleType.VRTechnologyVT369, "V.R. Technology VT369")]
+        [InlineData(ExtendedConsoleType.UMCUM6578, "UMC UM6578")]
+        [InlineData(ExtendedConsoleType.FamicomNetworkSystem, "Famicom Network System")]
+        [InlineData(ExtendedConsoleType.ReservedD, "Reserved (0x0D)")]
+        [InlineData(ExtendedConsoleType.ReservedE, "Reserved (0x0E)")]
+        [InlineData(ExtendedConsoleType.ReservedF, "Reserved (0x0F)")]
+        public void FromExtendedConsoleTypeTest(ExtendedConsoleType type, string expected)
+        {
+            string actual = type.FromExtendedConsoleType();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(NametableArrangement.Vertical, "Vertical")]
+        [InlineData(NametableArrangement.Horizontal, "Horizontal")]
+        public void FromNametableArrangementTest(NametableArrangement arrangement, string expected)
+        {
+            string actual = arrangement.FromNametableArrangement();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(TVSystem.NTSC, "NTSC")]
+        [InlineData(TVSystem.PAL, "PAL")]
+        public void FromTVSystemTest(TVSystem system, string expected)
+        {
+            string actual = system.FromTVSystem();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(TVSystemExtended.NTSC, "NTSC")]
+        [InlineData(TVSystemExtended.DualCompatible1, "Dual-compatible (0x01)")]
+        [InlineData(TVSystemExtended.PAL, "PAL")]
+        [InlineData(TVSystemExtended.DualCompatible3, "Dual-compatible (0x03)")]
+        public void FromTVSystemExtendedTest(TVSystemExtended system, string expected)
+        {
+            string actual = system.FromTVSystemExtended();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(VsHardwareType.VsUnisystem, "Vs. Unisystem (normal)")]
+        [InlineData(VsHardwareType.VsUnisystemRBIBaseballProtection, "Vs. Unisystem (RBI Baseball protection)")]
+        [InlineData(VsHardwareType.VsUnisystemTKOBoxingProtection, "Vs. Unisystem (TKO Boxing protection)")]
+        [InlineData(VsHardwareType.VsUnisystemSuperXeviousProtection, "Vs. Unisystem (Super Xevious protection)")]
+        [InlineData(VsHardwareType.VsUnisystemVsIceClimberJapanProtection, "Vs. Unisystem (Vs. Ice Climber Japan protection)")]
+        [InlineData(VsHardwareType.VsDualSystem, "Vs. Dual System (normal)")]
+        [InlineData(VsHardwareType.VsDualSystemRaidOnBungelingBayProtection, "Vs. Dual System (Raid on Bungeling Bay protection)")]
+        public void FromVsHardwareTypeTest(VsHardwareType type, string expected)
+        {
+            string actual = type.FromVsHardwareType();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(VsSystemType.AnyRP2C03RC2C03Variant, "Any RP2C03/RC2C03 variant")]
+        [InlineData(VsSystemType.Reserved1, "Reserved (0x01)")]
+        [InlineData(VsSystemType.RP2C040001, "RP2C04-0001")]
+        [InlineData(VsSystemType.RP2C040002, "RP2C04-0002")]
+        [InlineData(VsSystemType.RP2C040003, "RP2C04-0003")]
+        [InlineData(VsSystemType.RP2C040004, "RP2C04-0004")]
+        [InlineData(VsSystemType.Reserved6, "Reserved (0x06)")]
+        [InlineData(VsSystemType.Reserved7, "Reserved (0x07)")]
+        [InlineData(VsSystemType.RC2C0501, "RC2C05-01 (signature unknown)")]
+        [InlineData(VsSystemType.RC2C0502, "RC2C05-02 ($2002 AND $3F =$3D)")]
+        [InlineData(VsSystemType.RC2C0503, "RC2C05-03 ($2002 AND $1F =$1C)")]
+        [InlineData(VsSystemType.RC2C0504, "RC2C05-04 ($2002 AND $1F =$1B)")]
+        [InlineData(VsSystemType.ReservedC, "Reserved (0x0C)")]
+        [InlineData(VsSystemType.ReservedD, "Reserved (0x0D)")]
+        [InlineData(VsSystemType.ReservedE, "Reserved (0x0E)")]
+        [InlineData(VsSystemType.ReservedF, "Reserved (0x0F)")]
+        public void FromVsSystemTypeTest(VsSystemType type, string expected)
+        {
+            string actual = type.FromVsSystemType();
+            Assert.Equal(expected, actual);
+        }
+    }
+}

SabreTools.Data.Extensions.Test/NewExecutableExtensionsTests.cs

@@ -0,0 +1,61 @@
+using SabreTools.Data.Models.NewExecutable;
+using Xunit;
+
+namespace SabreTools.Data.Extensions.Test
+{
+    public class NewExecutableExtensionsTests
+    {
+        #region IsIntegerType
+
+        [Fact]
+        public void IsIntegerType_RTIE_HighBitSet_True()
+        {
+            var entry = new ResourceTypeInformationEntry { TypeID = 0xFFFF };
+            bool actual = entry.IsIntegerType();
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void IsIntegerType_RTIE_HighBitClear_False()
+        {
+            var entry = new ResourceTypeInformationEntry { TypeID = 0x0000 };
+            bool actual = entry.IsIntegerType();
+            Assert.False(actual);
+        }
+
+        [Fact]
+        public void IsIntegerType_RTRE_HighBitSet_True()
+        {
+            var entry = new ResourceTypeResourceEntry { ResourceID = 0xFFFF };
+            bool actual = entry.IsIntegerType();
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void IsIntegerType_RTRE_HighBitClear_False()
+        {
+            var entry = new ResourceTypeResourceEntry { ResourceID = 0x0000 };
+            bool actual = entry.IsIntegerType();
+            Assert.False(actual);
+        }
+
+        #endregion
+
+        #region GetEntryType
+
+        [Theory]
+        [InlineData(0x00, SegmentEntryType.Unused)]
+        [InlineData(0x01, SegmentEntryType.FixedSegment)]
+        [InlineData(0xAA, SegmentEntryType.FixedSegment)]
+        [InlineData(0xFE, SegmentEntryType.FixedSegment)]
+        [InlineData(0xFF, SegmentEntryType.MoveableSegment)]
+        public void GetEntryTypeTest(byte segmentIndicator, SegmentEntryType expected)
+        {
+            var entry = new EntryTableBundle { SegmentIndicator = segmentIndicator };
+            SegmentEntryType actual = entry.GetEntryType();
+            Assert.Equal(expected, actual);
+        }
+
+        #endregion
+    }
+}

SabreTools.Data.Extensions.Test/NintendoDiscExtensionsTests.cs

@@ -0,0 +1,129 @@
+using SabreTools.Data.Models.NintendoDisc;
+using Xunit;
+
+namespace SabreTools.Data.Extensions.Test
+{
+    public class NintendoDiscExtensionsTests
+    {
+        #region GetPlatform
+
+        [Fact]
+        public void GetPlatform_Object_WiiMagic_Wii()
+        {
+            var header = new DiscHeader { WiiMagic = Constants.WiiMagicWord };
+            Platform actual = header.GetPlatform();
+            Assert.Equal(Platform.Wii, actual);
+        }
+
+        [Fact]
+        public void GetPlatform_Object_GCMagic_GC()
+        {
+            var header = new DiscHeader { GCMagic = Constants.GCMagicWord };
+            Platform actual = header.GetPlatform();
+            Assert.Equal(Platform.GameCube, actual);
+        }
+
+        [Fact]
+        public void GetPlatform_Object_ValidGameID_GC()
+        {
+            var header = new DiscHeader { GameId = "GABC01" };
+            Platform actual = header.GetPlatform();
+            Assert.Equal(Platform.GameCube, actual);
+        }
+
+        [Fact]
+        public void GetPlatform_Object_InvalidGameID_Unknown()
+        {
+            var header = new DiscHeader { GameId = "XABC01" };
+            Platform actual = header.GetPlatform();
+            Assert.Equal(Platform.Unknown, actual);
+        }
+
+        [Fact]
+        public void GetPlatform_Object_DefaultHeader_Unknown()
+        {
+            var header = new DiscHeader();
+            Platform actual = header.GetPlatform();
+            Assert.Equal(Platform.Unknown, actual);
+        }
+
+        [Fact]
+        public void GetPlatform_Bytes_WiiMagic_Wii()
+        {
+            byte[] header =
+            [
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x00-0x07
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x08-0x0F
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x10-0x17
+                0x5D, 0x1C, 0x9E, 0xA3, 0x00, 0x00, 0x00, 0x00, // 0x18-0x1F
+            ];
+
+            Platform actual = header.GetPlatform();
+            Assert.Equal(Platform.Wii, actual);
+        }
+
+        [Fact]
+        public void GetPlatform_Bytes_GCMagic_GC()
+        {
+            byte[] header =
+            [
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x00-0x07
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x08-0x0F
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x10-0x17
+                0x00, 0x00, 0x00, 0x00, 0xC2, 0x33, 0x9F, 0x3D, // 0x18-0x1F
+            ];
+
+            Platform actual = header.GetPlatform();
+            Assert.Equal(Platform.GameCube, actual);
+        }
+
+        [Fact]
+        public void GetPlatform_Bytes_ValidGameID_GC()
+        {
+            byte[] header = [(byte)'G', (byte)'A', (byte)'B', (byte)'C'];
+
+            Platform actual = header.GetPlatform();
+            Assert.Equal(Platform.GameCube, actual);
+        }
+
+        [Fact]
+        public void GetPlatform_Bytes_InvalidGameID_Unknown()
+        {
+            byte[] header = [(byte)'G', (byte)'A', (byte)'B', 0x00];
+
+            Platform actual = header.GetPlatform();
+            Assert.Equal(Platform.Unknown, actual);
+        }
+
+        [Fact]
+        public void GetPlatform_Bytes_DefaultHeader_Unknown()
+        {
+            byte[] header = [];
+
+            Platform actual = header.GetPlatform();
+            Assert.Equal(Platform.Unknown, actual);
+        }
+
+        #endregion
+
+        #region IsGameCubeTitleType
+
+        [Theory]
+        [InlineData('\0', false)]
+        [InlineData('a', false)]
+        [InlineData('A', false)]
+        [InlineData('d', false)]
+        [InlineData('D', true)]
+        [InlineData('g', false)]
+        [InlineData('G', true)]
+        [InlineData('r', false)]
+        [InlineData('R', true)]
+        public void IsGameCubeTitleTypeTest(char c, bool expected)
+        {
+            bool actual = c.IsGameCubeTitleType();
+            Assert.Equal(expected, actual);
+        }
+
+        #endregion
+    }
+}

SabreTools.Data.Extensions.Test/OperaFSExtensionsTests.cs

@@ -0,0 +1,26 @@
+using SabreTools.Data.Models.OperaFS;
+using Xunit;
+
+namespace SabreTools.Data.Extensions.Test
+{
+    public class OperaFSExtensionsTests
+    {
+        [Fact]
+        public void DirectoryDescriptor_EqualsExactly_Empty()
+        {
+            var dir1 = new DirectoryDescriptor();
+            var dir2 = new DirectoryDescriptor();
+            bool actual = dir1.EqualsExactly(dir2);
+            Assert.True(actual);
+        }
+
+        [Fact]
+        public void DirectoryRecord_EqualsExactly_Empty()
+        {
+            var dr1 = new DirectoryRecord();
+            var dr2 = new DirectoryRecord();
+            bool actual = dr1.EqualsExactly(dr2);
+            Assert.True(actual);
+        }
+    }
+}

SabreTools.Data.Extensions.Test/SabreTools.Data.Extensions.Test.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+        <IsPackable>false</IsPackable>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="10.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="4.0.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\SabreTools.Data.Extensions\SabreTools.Data.Extensions.csproj" />
+    </ItemGroup>
+
+</Project>

SabreTools.Data.Extensions.Test/TypeLengthValueTests.cs

@@ -1,9 +1,9 @@
 using System;
-using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.ASN1;
 using Xunit;
 
-namespace SabreTools.Serialization.Test.Extensions
+#pragma warning disable IDE0230 // Use UTF-8 string literal
+namespace SabreTools.Data.Extensions.Test
 {
     public class TypeLengthValueTests
     {
@@ -13,7 +13,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_EOC()
         {
             string expected = "Type: V_ASN1_EOC";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_EOC, Length = 0, Value = null };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_EOC, Length = 0, Value = null };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -22,7 +22,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ZeroLength()
         {
             string expected = "Type: V_ASN1_NULL, Length: 0";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_NULL, Length = 0, Value = null };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_NULL, Length = 0, Value = null };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -31,7 +31,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_InvalidConstructed()
         {
             string expected = "Type: V_ASN1_OBJECT, V_ASN1_CONSTRUCTED, Length: 1, Value: [INVALID DATA TYPE]";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT | ASN1Type.V_ASN1_CONSTRUCTED, Length = 1, Value = (object?)false };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT | ASN1Type.V_ASN1_CONSTRUCTED, Length = 1, Value = false };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -40,8 +40,8 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ValidConstructed()
         {
             string expected = "Type: V_ASN1_OBJECT, V_ASN1_CONSTRUCTED, Length: 3, Value:\n Type: V_ASN1_BOOLEAN, Length: 1, Value: True";
-            var boolTlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 1, Value = new byte[] { 0x01 } };
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT | ASN1Type.V_ASN1_CONSTRUCTED, Length = 3, Value = new Data.Models.ASN1.TypeLengthValue[] { boolTlv } };
+            var boolTlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 1, Value = new byte[] { 0x01 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT | ASN1Type.V_ASN1_CONSTRUCTED, Length = 3, Value = new TypeLengthValue[] { boolTlv } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -50,7 +50,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_InvalidDataType()
         {
             string expected = "Type: V_ASN1_OBJECT, Length: 1, Value: [INVALID DATA TYPE]";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT, Length = 1, Value = (object?)false };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT, Length = 1, Value = false };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_InvalidLength()
         {
             string expected = "Type: V_ASN1_NULL, Length: 1, Value: [NO DATA]";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_NULL, Length = 1, Value = Array.Empty<byte>() };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_NULL, Length = 1, Value = Array.Empty<byte>() };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -68,7 +68,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_InvalidBooleanLength()
         {
             string expected = "Type: V_ASN1_BOOLEAN, Length: 2 [Expected length of 1], Value: True";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 2, Value = new byte[] { 0x01 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 2, Value = new byte[] { 0x01 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -77,7 +77,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_InvalidBooleanArrayLength()
         {
             string expected = "Type: V_ASN1_BOOLEAN, Length: 1 [Expected value length of 1], Value: True";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 1, Value = new byte[] { 0x01, 0x00 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 1, Value = new byte[] { 0x01, 0x00 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -86,7 +86,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ValidBoolean()
         {
             string expected = "Type: V_ASN1_BOOLEAN, Length: 1, Value: True";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 1, Value = new byte[] { 0x01 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_BOOLEAN, Length = 1, Value = new byte[] { 0x01 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -95,7 +95,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ValidInteger()
         {
             string expected = "Type: V_ASN1_INTEGER, Length: 1, Value: 1";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_INTEGER, Length = 1, Value = new byte[] { 0x01 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_INTEGER, Length = 1, Value = new byte[] { 0x01 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -104,7 +104,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ValidBitString_NoBits()
         {
             string expected = "Type: V_ASN1_BIT_STRING, Length: 1, Value with 0 unused bits";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_BIT_STRING, Length = 1, Value = new byte[] { 0x00 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_BIT_STRING, Length = 1, Value = new byte[] { 0x00 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -113,7 +113,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ValidBitString_Bits()
         {
             string expected = "Type: V_ASN1_BIT_STRING, Length: 1, Value with 1 unused bits: 01";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_BIT_STRING, Length = 1, Value = new byte[] { 0x01, 0x01 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_BIT_STRING, Length = 1, Value = new byte[] { 0x01, 0x01 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -122,7 +122,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ValidOctetString()
         {
             string expected = "Type: V_ASN1_OCTET_STRING, Length: 1, Value: 01";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_OCTET_STRING, Length = 1, Value = new byte[] { 0x01 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_OCTET_STRING, Length = 1, Value = new byte[] { 0x01 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -131,7 +131,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ValidObject()
         {
             string expected = "Type: V_ASN1_OBJECT, Length: 3, Value: 0.1.2.3 (/ITU-T/1/2/3)";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT, Length = 3, Value = new byte[] { 0x01, 0x02, 0x03 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT, Length = 3, Value = new byte[] { 0x01, 0x02, 0x03 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -140,7 +140,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ValidUTF8String()
         {
             string expected = "Type: V_ASN1_UTF8STRING, Length: 3, Value: ABC";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_UTF8STRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_UTF8STRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -149,7 +149,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ValidPrintableString()
         {
             string expected = "Type: V_ASN1_PRINTABLESTRING, Length: 3, Value: ABC";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_PRINTABLESTRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_PRINTABLESTRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -158,7 +158,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ValidTeletexString()
         {
             string expected = "Type: V_ASN1_TELETEXSTRING, Length: 3, Value: ABC";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_TELETEXSTRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_TELETEXSTRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -167,7 +167,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ValidIA5String()
         {
             string expected = "Type: V_ASN1_IA5STRING, Length: 3, Value: ABC";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_IA5STRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_IA5STRING, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -176,7 +176,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_InvalidUTCTime()
         {
             string expected = "Type: V_ASN1_UTCTIME, Length: 3, Value: ABC";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_UTCTIME, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_UTCTIME, Length = 3, Value = new byte[] { 0x41, 0x42, 0x43 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -185,7 +185,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ValidUTCTime()
         {
             string expected = "Type: V_ASN1_UTCTIME, Length: 3, Value: 1980-01-01 00:00:00";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_UTCTIME, Length = 3, Value = new byte[] { 0x31, 0x39, 0x38, 0x30, 0x2D, 0x30, 0x31, 0x2D, 0x30, 0x31, 0x20, 0x30, 0x30, 0x3A, 0x30, 0x30, 0x3A, 0x30, 0x30 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_UTCTIME, Length = 3, Value = new byte[] { 0x31, 0x39, 0x38, 0x30, 0x2D, 0x30, 0x31, 0x2D, 0x30, 0x31, 0x20, 0x30, 0x30, 0x3A, 0x30, 0x30, 0x3A, 0x30, 0x30 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -194,7 +194,7 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ValidBmpString()
         {
             string expected = "Type: V_ASN1_BMPSTRING, Length: 6, Value: ABC";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_BMPSTRING, Length = 6, Value = new byte[] { 0x41, 0x00, 0x42, 0x00, 0x43, 0x00 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_BMPSTRING, Length = 6, Value = new byte[] { 0x41, 0x00, 0x42, 0x00, 0x43, 0x00 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
@@ -203,11 +203,11 @@ namespace SabreTools.Serialization.Test.Extensions
         public void Format_ValidUnformatted()
         {
             string expected = "Type: V_ASN1_OBJECT_DESCRIPTOR, Length: 1, Value: 01";
-            var tlv = new Data.Models.ASN1.TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT_DESCRIPTOR, Length = 1, Value = new byte[] { 0x01 } };
+            var tlv = new TypeLengthValue { Type = ASN1Type.V_ASN1_OBJECT_DESCRIPTOR, Length = 1, Value = new byte[] { 0x01 } };
             string actual = tlv.Format();
             Assert.Equal(expected, actual);
         }
 
         #endregion
     }
-}
+}

SabreTools.Data.Extensions.Test/WiseScriptExtensionsTests.cs

@@ -0,0 +1,59 @@
+using Xunit;
+
+namespace SabreTools.Data.Extensions.Test
+{
+    public class WiseScriptExtensionsTests
+    {
+        [Theory]
+        // Defined functions
+        [InlineData("f0", "Add Directory to PATH")]
+        [InlineData("f1", "Add to AUTOEXEC.BAT")]
+        [InlineData("f2", "Add to CONFIG.SYS")]
+        [InlineData("f3", "Add to SYSTEM.INI")]
+        [InlineData("f8", "Read INI Value")]
+        [InlineData("f9", "Get Registry Key Value")]
+        [InlineData("f10", "Register Font")]
+        [InlineData("f11", "Win32 System Directory")]
+        [InlineData("f12", "Check Configuration")]
+        [InlineData("f13", "Search for File")]
+        [InlineData("f15", "Read/Write Binary File")]
+        [InlineData("f16", "Set Variable")]
+        [InlineData("f17", "Get Environment Variable")]
+        [InlineData("f19", "Check if File/Dir Exists")]
+        [InlineData("f20", "Set File Attributes")]
+        [InlineData("f21", "Set Files/Buffers")]
+        [InlineData("f22", "Find File in Path")]
+        [InlineData("f23", "Check Disk Space")]
+        [InlineData("f25", "Insert Line Into Text File")]
+        [InlineData("f27", "Parse String")]
+        [InlineData("f28", "Exit Installation")]
+        [InlineData("f29", "Self-Register OCXs/DLLs")]
+        [InlineData("f30", "Install DirectX Components")]
+        [InlineData("f31", "Wizard Block")]
+        [InlineData("f33", "Read/Update Text File")]
+        [InlineData("f34", "Post to HTTP Server")]
+        [InlineData("f35", "Prompt for Filename")]
+        [InlineData("f36", "Start/Stop Service")]
+        [InlineData("f38", "Check HTTP Connection")]
+        // Undefined functions
+        [InlineData("f4", "UNDEFINED f4")]
+        [InlineData("f5", "UNDEFINED f5")]
+        [InlineData("f6", "UNDEFINED f6")]
+        [InlineData("f7", "UNDEFINED f7")]
+        [InlineData("f14", "UNDEFINED f14")]
+        [InlineData("f18", "UNDEFINED f18")]
+        [InlineData("f24", "UNDEFINED f24")]
+        [InlineData("f26", "UNDEFINED f26")]
+        [InlineData("f32", "UNDEFINED f32")]
+        [InlineData("f37", "UNDEFINED f37")]
+        // External DLL
+        [InlineData(null, null)]
+        [InlineData("f99", "UNDEFINED f99")]
+        [InlineData("func", "External: func")]
+        public void FromWiseFunctionIdTest(string? functionId, string? expected)
+        {
+            string? actual = functionId.FromWiseFunctionId();
+            Assert.Equal(expected, actual);
+        }
+    }
+}

SabreTools.Data.Extensions.Test/XZExtensionsTests.cs

@@ -0,0 +1,20 @@
+using System.Linq;
+using Xunit;
+
+namespace SabreTools.Data.Extensions.Test
+{
+    public class XZExtensionsTests
+    {
+        [Fact]
+        public void VariableLengthIntegerTest()
+        {
+            ulong expected = 123456789;
+            byte[] encoded = expected.EncodeVariableLength();
+            Assert.True(encoded.SequenceEqual<byte>([0x95, 0x9A, 0xEF, 0x3A]));
+
+            ulong actual = encoded.DecodeVariableLength(maxSize: 16, out int length);
+            Assert.Equal(expected, actual);
+            Assert.Equal(4, length);
+        }
+    }
+}

SabreTools.Data.Extensions.Test/XboxExecutableExtensionsTests.cs

@@ -0,0 +1,17 @@
+using Xunit;
+
+namespace SabreTools.Data.Extensions.Test
+{
+    public class XboxExecutableExtensionsTests
+    {
+        [Theory]
+        [InlineData(0x00000000, "0000-000")]
+        [InlineData(0x4142000F, "AB-015")]
+        [InlineData(0x3132F000, "12-61440")]
+        public void ToFormattedXBETitleIDTest(uint value, string expected)
+        {
+            string actual = value.ToFormattedXBETitleID();
+            Assert.Equal(expected, actual);
+        }
+    }
+}

SabreTools.Data.Extensions.Test/ZArchiveExtensionsTests.cs

@@ -0,0 +1,18 @@
+using SabreTools.Data.Models.ZArchive;
+using Xunit;
+
+namespace SabreTools.Data.Extensions.Test
+{
+    public class ZArchiveExtensionsTests
+    {
+        [Fact]
+        public void GetName_Null()
+        {
+            var de = new DirectoryEntry();
+            NameTable nt = new NameTable();
+            string? expected = null;
+            string? actual = de.GetName(nt);
+            Assert.Equal(expected, actual);
+        }
+    }
+}

SabreTools.Data.Extensions/Atari7800CartExtensions.cs

@@ -0,0 +1,327 @@
+using System.Collections.Generic;
+using SabreTools.Data.Models.Atari7800;
+
+namespace SabreTools.Data.Extensions
+{
+    public static class Atari7800CartExtensions
+    {
+        /// <summary>
+        /// Convert a <see cref="AudioDevice"/> value to string
+        /// </summary>
+        public static string FromAudioDevice(this AudioDevice audio)
+        {
+            string[] devices = new string[4];
+
+            byte pokey = (byte)((byte)audio & 0x07);
+            devices[0] = pokey switch
+            {
+                0 => "POKEY - none",
+                1 => "POKEY - @440",
+                2 => "POKEY - @450",
+                3 => "POKEY - @450+@440",
+                4 => "POKEY - @800",
+                5 => "POKEY - @4000",
+                _ => $"Unknown {pokey}",
+            };
+
+            byte ym2151 = (byte)(((byte)audio >> 3) & 0x01);
+            devices[1] = ym2151 switch
+            {
+                0 => "No YM2151 @460",
+                1 => "YM2151 @460",
+                _ => $"Unknown {ym2151}",
+            };
+
+            byte covox = (byte)(((byte)audio >> 4) & 0x01);
+            devices[2] = covox switch
+            {
+                0 => "No COVOX @430",
+                1 => "COVOX @430",
+                _ => $"Unknown {covox}",
+            };
+
+            byte adpcm = (byte)(((byte)audio >> 5) & 0x01);
+            devices[3] = adpcm switch
+            {
+                0 => "No ADPCM Audio Stream @420",
+                1 => "ADPCM Audio Stream @420",
+                _ => $"Unknown {adpcm}",
+            };
+
+            return string.Join(", ", [.. devices]);
+        }
+
+        /// <summary>
+        /// Convert a <see cref="CartType"/> value to string
+        /// </summary>
+        public static string FromCartType(this CartType type)
+        {
+            List<string> types = [];
+
+#if NET20 || NET35
+            if ((type & CartType.PokeyAt4000) != 0)
+#else
+            if (type.HasFlag(CartType.PokeyAt4000))
+#endif
+                types.Add("pokey at $4000");
+
+#if NET20 || NET35
+            if ((type & CartType.SupergameBankSwitched) != 0)
+#else
+            if (type.HasFlag(CartType.SupergameBankSwitched))
+#endif
+                types.Add("supergame bank switched");
+
+#if NET20 || NET35
+            if ((type & CartType.SupergameRamAt4000) != 0)
+#else
+            if (type.HasFlag(CartType.SupergameRamAt4000))
+#endif
+                types.Add("supergame ram at $4000");
+
+#if NET20 || NET35
+            if ((type & CartType.RomAt4000) != 0)
+#else
+            if (type.HasFlag(CartType.RomAt4000))
+#endif
+                types.Add("rom at $4000");
+
+#if NET20 || NET35
+            if ((type & CartType.Bank6At4000) != 0)
+#else
+            if (type.HasFlag(CartType.Bank6At4000))
+#endif
+                types.Add("bank 6 at $4000");
+
+#if NET20 || NET35
+            if ((type & CartType.BankedRam) != 0)
+#else
+            if (type.HasFlag(CartType.BankedRam))
+#endif
+                types.Add("banked ram");
+
+#if NET20 || NET35
+            if ((type & CartType.PokeyAt450) != 0)
+#else
+            if (type.HasFlag(CartType.PokeyAt450))
+#endif
+                types.Add("pokey at $450");
+
+#if NET20 || NET35
+            if ((type & CartType.MirrorRamAt4000) != 0)
+#else
+            if (type.HasFlag(CartType.MirrorRamAt4000))
+#endif
+                types.Add("mirror ram at $4000");
+
+#if NET20 || NET35
+            if ((type & CartType.ActivisionBanking) != 0)
+#else
+            if (type.HasFlag(CartType.ActivisionBanking))
+#endif
+                types.Add("activision banking");
+
+#if NET20 || NET35
+            if ((type & CartType.AbsoluteBanking) != 0)
+#else
+            if (type.HasFlag(CartType.AbsoluteBanking))
+#endif
+                types.Add("absolute banking");
+
+#if NET20 || NET35
+            if ((type & CartType.PokeyAt440) != 0)
+#else
+            if (type.HasFlag(CartType.PokeyAt440))
+#endif
+                types.Add("pokey at $440");
+
+#if NET20 || NET35
+            if ((type & CartType.Ym2151At460461) != 0)
+#else
+            if (type.HasFlag(CartType.Ym2151At460461))
+#endif
+                types.Add("ym2151 at $460/$461");
+
+#if NET20 || NET35
+            if ((type & CartType.Souper) != 0)
+#else
+            if (type.HasFlag(CartType.Souper))
+#endif
+                types.Add("souper");
+
+#if NET20 || NET35
+            if ((type & CartType.Banksets) != 0)
+#else
+            if (type.HasFlag(CartType.Banksets))
+#endif
+                types.Add("banksets");
+
+#if NET20 || NET35
+            if ((type & CartType.HaltBankedRam) != 0)
+#else
+            if (type.HasFlag(CartType.HaltBankedRam))
+#endif
+                types.Add("halt banked ram");
+
+#if NET20 || NET35
+            if ((type & CartType.PokeyAt800) != 0)
+#else
+            if (type.HasFlag(CartType.PokeyAt800))
+#endif
+                types.Add("pokey@800");
+
+            // If no flags are set
+            if (types.Count == 0)
+                types.Add("N/A");
+
+            return string.Join(", ", [.. types]);
+        }
+
+        /// <summary>
+        /// Convert a <see cref="ControllerType"/> value to string
+        /// </summary>
+        public static string FromControllerType(this ControllerType type)
+        {
+            return type switch
+            {
+                ControllerType.None => "none",
+                ControllerType.Joystick => "7800 joystick",
+                ControllerType.Lightgun => "lightgun",
+                ControllerType.Paddle => "paddle",
+                ControllerType.Trakball => "trakball",
+                ControllerType.VcsJoystick => "2600 joystick",
+                ControllerType.VcsDriving => "2600 driving",
+                ControllerType.VcsKeypad => "2600 keypad",
+                ControllerType.STMouse => "ST mouse",
+                ControllerType.AmigaMouse => "Amiga mouse",
+                ControllerType.AtariVoxSaveKey => "AtariVox/SaveKey",
+                ControllerType.SNES2Atari => "SNES2Atari",
+                ControllerType.Mega7800 => "Mega7800",
+                _ => $"Unknown {(byte)type}",
+            };
+        }
+
+        /// <summary>
+        /// Convert a <see cref="Interrupt"/> value to string
+        /// </summary>
+        public static string FromInterrupt(this Interrupt interrupt)
+        {
+            return interrupt switch
+            {
+                Interrupt.None => "None",
+                Interrupt.Pokey1 => "POKEY 1 (@450 | @800 | @4000)",
+                Interrupt.Pokey2 => "POKEY 2 (@440)",
+                Interrupt.YM2151 => "YM2151",
+                _ => $"Unknown {(byte)interrupt}",
+            };
+        }
+
+        /// <summary>
+        /// Convert a <see cref="Mapper"/> value to string
+        /// </summary>
+        public static string FromMapper(this Mapper mapper)
+        {
+            return mapper switch
+            {
+                Mapper.Linear => "Linear",
+                Mapper.SuperGame => "SuperGame",
+                Mapper.Activision => "Activision",
+                Mapper.Absolute => "Absolute",
+                Mapper.Souper => "Souper",
+                _ => $"Unknown {(byte)mapper}",
+            };
+        }
+
+        /// <summary>
+        /// Convert a <see cref="MapperOptions"/> value to string
+        /// </summary>
+        public static string FromMapperOptions(this MapperOptions options)
+        {
+            string[] romOptions = new string[2];
+
+            byte option4000 = (byte)((byte)options & 0x07);
+            romOptions[0] = option4000 switch
+            {
+                0 => "Option at @4000 - none",
+                1 => "Option at @4000 - 16K RAM",
+                2 => "Option at @4000 - 8K EXRAM/A8",
+                3 => "Option at @4000 - 32K EXRAM/M2",
+                4 => "Option at @4000 - EXROM",
+                5 => "Option at @4000 - EXFIX",
+                6 => "Option at @4000 - 32k EXRAM/X2",
+                _ => $"Unknown {option4000}",
+            };
+
+            byte romType = (byte)(((byte)options >> 7) & 0x01);
+            romOptions[1] = romType switch
+            {
+                0 => "Standard ROM",
+                1 => "Bankset ROM",
+                _ => $"Unknown {romType}",
+            };
+
+            return string.Join(", ", [.. romOptions]);
+        }
+
+        /// <summary>
+        /// Convert a <see cref="SaveDevice"/> value to string
+        /// </summary>
+        public static string FromSaveDevice(this SaveDevice device)
+        {
+            return device switch
+            {
+                SaveDevice.None => "None",
+                SaveDevice.HSC => "HSC",
+                SaveDevice.SaveKeyAtariVox => "SaveKey/AtariVox",
+                _ => $"Unknown {(byte)device}",
+            };
+        }
+
+        /// <summary>
+        /// Convert a <see cref="SlotPassthroughDevice"/> value to string
+        /// </summary>
+        public static string FromSlotPassthroughDevice(this SlotPassthroughDevice device)
+        {
+            return device switch
+            {
+                SlotPassthroughDevice.None => "None",
+                SlotPassthroughDevice.XM => "XM",
+                _ => $"Unknown {(byte)device}",
+            };
+        }
+
+        /// <summary>
+        /// Convert a <see cref="TVType"/> value to string
+        /// </summary>
+        public static string FromTVType(this TVType type)
+        {
+            string[] types = new string[3];
+
+            byte standard = (byte)((byte)type & 0x01);
+            types[0] = standard switch
+            {
+                0 => "NTSC",
+                1 => "PAL",
+                _ => $"Unknown {standard}",
+            };
+
+            byte connection = (byte)(((byte)type >> 1) & 0x01);
+            types[1] = connection switch
+            {
+                0 => "Component",
+                1 => "Composite",
+                _ => $"Unknown {standard}",
+            };
+
+            byte region = (byte)(((byte)type >> 2) & 0x01);
+            types[2] = region switch
+            {
+                0 => "Single-region",
+                1 => "Multi-region",
+                _ => $"Unknown {standard}",
+            };
+
+            return string.Join(", ", [.. types]);
+        }
+    }
+}

SabreTools.Data.Extensions/AtariLynxCartExtensions.cs

@@ -0,0 +1,21 @@
+using SabreTools.Data.Models.AtariLynx;
+
+namespace SabreTools.Data.Extensions
+{
+    public static class AtariLynxCartExtensions
+    {
+        /// <summary>
+        /// Convert a <see cref="Rotation"/> value to string
+        /// </summary>
+        public static string FromRotation(this Rotation rotation)
+        {
+            return rotation switch
+            {
+                Rotation.NoRotation => "No rotation (horizontal, buttons right)",
+                Rotation.RotateLeft => "Rotate left (vertical, buttons down)",
+                Rotation.RotateRight => "Rotate right (vertical, buttons up)",
+                _ => $"Unknown {(byte)rotation}",
+            };
+        }
+    }
+}

SabreTools.Data.Extensions/BSPExtensions.cs

@@ -0,0 +1,33 @@
+using SabreTools.Data.Models.BSP;
+
+namespace SabreTools.Data.Extensions
+{
+    public static class BSPExtensions
+    {
+        /// <summary>
+        /// Convert a <see cref="BspLumpType"/> value to string
+        /// </summary>
+        public static string FromBspLumpType(this BspLumpType type)
+        {
+            return type switch
+            {
+                BspLumpType.LUMP_ENTITIES => " - LUMP_ENTITIES",
+                BspLumpType.LUMP_PLANES => " - LUMP_PLANES",
+                BspLumpType.LUMP_TEXTURES => " - LUMP_TEXTURES",
+                BspLumpType.LUMP_VERTICES => " - LUMP_VERTICES",
+                BspLumpType.LUMP_VISIBILITY => " - LUMP_VISIBILITY",
+                BspLumpType.LUMP_NODES => " - LUMP_NODES",
+                BspLumpType.LUMP_TEXINFO => " - LUMP_TEXINFO",
+                BspLumpType.LUMP_FACES => " - LUMP_FACES",
+                BspLumpType.LUMP_LIGHTING => " - LUMP_LIGHTING",
+                BspLumpType.LUMP_CLIPNODES => " - LUMP_CLIPNODES",
+                BspLumpType.LUMP_LEAVES => " - LUMP_LEAVES",
+                BspLumpType.LUMP_MARKSURFACES => " - LUMP_MARKSURFACES",
+                BspLumpType.LUMP_EDGES => " - LUMP_EDGES",
+                BspLumpType.LUMP_SURFEDGES => " - LUMP_SURFEDGES",
+                BspLumpType.LUMP_MODELS => " - LUMP_MODELS",
+                _ => string.Empty,
+            };
+        }
+    }
+}

SabreTools.Data.Extensions/CDROMExtensions.cs

@@ -0,0 +1,313 @@
+using System;
+using System.IO;
+using SabreTools.Data.Models.CDROM;
+using SabreTools.IO.Extensions;
+using SabreTools.Numerics.Extensions;
+
+namespace SabreTools.Data.Extensions
+{
+    public static class CDROMExtensions
+    {
+        /// <summary>
+        /// Get the sector mode for a CD-ROM stream
+        /// </summary>
+        /// <param name="stream">Stream to derive the sector mode from</param>
+        /// <returns>Sector mode from the stream on success, <see cref="SectorMode.UNKNOWN"/> on error</returns>
+        public static SectorMode GetSectorMode(this Stream stream)
+        {
+            try
+            {
+                byte modeByte = stream.ReadByteValue();
+                if (modeByte == 0)
+                {
+                    return SectorMode.MODE0;
+                }
+                else if (modeByte == 1)
+                {
+                    return SectorMode.MODE1;
+                }
+                else if (modeByte == 2)
+                {
+                    stream.SeekIfPossible(2, SeekOrigin.Current);
+                    byte submode = stream.ReadByteValue();
+                    if ((submode & 0x20) == 0x20)
+                        return SectorMode.MODE2_FORM2;
+                    else
+                        return SectorMode.MODE2_FORM1;
+                }
+                else
+                {
+                    return SectorMode.UNKNOWN;
+                }
+            }
+            catch
+            {
+                // Ignore the actual error
+                return SectorMode.UNKNOWN;
+            }
+        }
+
+        /// <summary>
+        /// Get the user data size for a sector mode
+        /// </summary>
+        /// <param name="mode">Sector mode to get a value for</param>
+        /// <returns>User data size, if possible</returns>
+        public static long GetUserDataSize(this SectorMode mode)
+        {
+            return mode switch
+            {
+                SectorMode.UNKNOWN => Constants.Mode0DataSize,
+                SectorMode.MODE0 => Constants.Mode0DataSize,
+                SectorMode.MODE1 => Constants.Mode1DataSize,
+                SectorMode.MODE2 => Constants.Mode0DataSize,
+                SectorMode.MODE2_FORM1 => Constants.Mode2Form1DataSize,
+                SectorMode.MODE2_FORM2 => Constants.Mode2Form2DataSize,
+                _ => Constants.Mode0DataSize,
+            };
+        }
+
+        /// <summary>
+        /// Get the user data end offset for a sector mode
+        /// </summary>
+        /// <param name="mode">Sector mode to get a value for</param>
+        /// <returns>User data end offset, if possible</returns>
+        public static long GetUserDataEnd(this SectorMode mode)
+        {
+            return mode switch
+            {
+                SectorMode.UNKNOWN => Constants.Mode0UserDataEnd,
+                SectorMode.MODE0 => Constants.Mode0UserDataEnd, // TODO: Support flexible sector length (2352)
+                SectorMode.MODE1 => Constants.Mode1UserDataEnd,
+                SectorMode.MODE2 => Constants.Mode0UserDataEnd, // TODO: Support flexible sector length (2352)
+                SectorMode.MODE2_FORM1 => Constants.Mode2Form1UserDataEnd,
+                SectorMode.MODE2_FORM2 => Constants.Mode2Form2UserDataEnd, // TODO: Support flexible sector length (2348)
+                _ => Constants.Mode0UserDataEnd,
+            };
+        }
+
+        /// <summary>
+        /// Get the user data start offset for a sector mode
+        /// </summary>
+        /// <param name="mode">Sector mode to get a value for</param>
+        /// <returns>User data start offset, if possible</returns>
+        public static long GetUserDataStart(this SectorMode mode)
+        {
+            return mode switch
+            {
+                SectorMode.UNKNOWN => Constants.Mode0UserDataStart,
+                SectorMode.MODE0 => Constants.Mode0UserDataStart,
+                SectorMode.MODE1 => Constants.Mode1UserDataStart,
+                SectorMode.MODE2 => Constants.Mode0UserDataStart,
+                SectorMode.MODE2_FORM1 => Constants.Mode2Form1UserDataStart,
+                SectorMode.MODE2_FORM2 => Constants.Mode2Form2UserDataStart,
+                _ => Constants.Mode0UserDataStart,
+            };
+        }
+
+        /// <summary>
+        /// Creates a stream that provides only the user data of a CDROM stream
+        /// </summary>
+        public class UserDataStream : Stream
+        {
+            // Base CDROM stream (2352-byte sector)
+            private readonly Stream _baseStream;
+
+            // State variables
+            private long _position = 0;
+            private SectorMode _currentMode = SectorMode.UNKNOWN;
+            private long _userDataStart = Constants.Mode1UserDataStart;
+            private long _userDataEnd = Constants.Mode1UserDataEnd;
+#pragma warning disable IDE0044
+            private long _isoSectorSize = Constants.Mode1DataSize;
+#pragma warning restore IDE0044
+
+            public UserDataStream(Stream inputStream)
+            {
+                if (!inputStream.CanSeek || !inputStream.CanRead)
+                    throw new ArgumentException("Stream must be readable and seekable.", nameof(inputStream));
+
+                _baseStream = inputStream;
+            }
+
+            /// <inheritdoc/>
+            public override bool CanRead => _baseStream.CanRead;
+
+            /// <inheritdoc/>
+            public override bool CanSeek => _baseStream.CanSeek;
+
+            /// <inheritdoc/>
+            public override bool CanWrite => false;
+
+            /// <inheritdoc/>
+            public override void Flush() => _baseStream.Flush();
+
+            /// <inheritdoc/>
+            public override long Length
+                => _baseStream.Length / Constants.CDROMSectorSize * _isoSectorSize;
+
+            /// <inheritdoc/>
+            public override void SetLength(long value)
+                => throw new NotSupportedException("Setting the length of this stream is not supported.");
+
+            /// <inheritdoc/>
+            public override void Write(byte[] buffer, int offset, int count)
+                => throw new NotSupportedException("Writing to this stream is not supported.");
+
+            /// <inheritdoc/>
+            protected override void Dispose(bool disposing)
+            {
+                if (disposing)
+                    _baseStream.Dispose();
+
+                base.Dispose(disposing);
+            }
+
+            /// <inheritdoc/>
+            public override long Position
+            {
+                // Get the position of the underlying ISO9660 stream
+                get
+                {
+                    // Get the user data location based on the current sector mode
+                    SetState(_position);
+
+                    // Get the number of ISO sectors before current position
+                    long isoPosition = _position / Constants.CDROMSectorSize * _isoSectorSize;
+
+                    // Add the within-sector position
+                    long remainder = _position % Constants.CDROMSectorSize;
+                    if (remainder > _userDataEnd)
+                        isoPosition += _isoSectorSize;
+                    else if (remainder > _userDataStart)
+                        isoPosition += remainder - _userDataStart;
+
+                    return isoPosition;
+                }
+                set
+                {
+                    // Seek to the underlying ISO9660 position
+                    Seek(value, SeekOrigin.Begin);
+                }
+            }
+
+            /// <inheritdoc/>
+            public override int Read(byte[] buffer, int offset, int count)
+            {
+                int totalRead = 0;
+                int remaining = count;
+
+                while (remaining > 0 && _position < _baseStream.Length)
+                {
+                    // Determine location of current sector
+                    long baseStreamOffset = _position - (_position % Constants.CDROMSectorSize);
+
+                    // Set the current sector's mode and user data location
+                    SetState(baseStreamOffset);
+
+                    // Deal with case where base position is not in ISO stream
+                    long remainder = _position % Constants.CDROMSectorSize;
+                    long sectorOffset = remainder - _userDataStart;
+                    if (remainder < _userDataStart)
+                    {
+                        baseStreamOffset += _userDataStart;
+                        sectorOffset = 0;
+                        _position += _userDataStart;
+                    }
+                    else if (remainder >= _userDataEnd)
+                    {
+                        baseStreamOffset += Constants.CDROMSectorSize;
+                        sectorOffset = 0;
+                        _position += Constants.CDROMSectorSize - _userDataEnd + _userDataStart;
+                    }
+                    else
+                    {
+                        baseStreamOffset += remainder;
+                    }
+
+                    // Sanity check on read location before seeking
+                    if (baseStreamOffset < 0 || baseStreamOffset > _baseStream.Length)
+                        throw new ArgumentOutOfRangeException(nameof(offset), "Attempted to seek outside the stream boundaries.");
+
+                    // Seek to target position in base CDROM stream
+                    _baseStream.SeekIfPossible(baseStreamOffset, SeekOrigin.Begin);
+
+                    // Read the remaining bytes, up to max of one ISO sector (2048 bytes)
+                    int bytesToRead = (int)Math.Min(remaining, _isoSectorSize - sectorOffset);
+
+                    // Don't overshoot end of stream
+                    bytesToRead = (int)Math.Min(bytesToRead, _baseStream.Length - _position);
+
+                    // Finish reading if no more bytes to be read
+                    if (bytesToRead <= 0)
+                        break;
+
+                    // Read up to 2048 bytes from base CDROM stream
+                    int bytesRead = _baseStream.Read(buffer, offset + totalRead, bytesToRead);
+
+                    // Update state for base stream
+                    _position = _baseStream.Position;
+                    if (bytesToRead == (_isoSectorSize - sectorOffset))
+                        _position += Constants.CDROMSectorSize - _userDataEnd + _userDataStart;
+
+                    // Update state for ISO stream
+                    totalRead += bytesRead;
+                    remaining -= bytesRead;
+
+                    if (bytesRead == 0)
+                        break;
+                }
+
+                return totalRead;
+            }
+
+            /// <inheritdoc/>
+            public override long Seek(long offset, SeekOrigin origin)
+            {
+                // Get the intended position for the ISO9660 stream
+                long targetPosition = origin switch
+                {
+                    SeekOrigin.Begin => offset,
+                    SeekOrigin.Current => Position + offset,
+                    SeekOrigin.End => Length + offset,
+                    _ => throw new ArgumentException("Invalid SeekOrigin.", nameof(origin)),
+                };
+
+                // Get the number of ISO sectors before current position
+                long newPosition = targetPosition / _isoSectorSize * Constants.CDROMSectorSize;
+
+                // Set the current sector's mode and user data location
+                SetState(newPosition);
+
+                // Add the within-sector position
+                newPosition += _userDataStart + (targetPosition % _isoSectorSize);
+                if (newPosition < 0 || newPosition > _baseStream.Length)
+                    throw new ArgumentOutOfRangeException(nameof(offset), "Attempted to seek outside the stream boundaries.");
+
+                _position = _baseStream.SeekIfPossible(newPosition, SeekOrigin.Begin);
+                return Position;
+            }
+
+            /// <summary>
+            /// Update the current stream state based on the location
+            /// </summary>
+            /// <param name="sectorLocation">Sector location to update from</param>
+            private void SetState(long sectorLocation)
+            {
+                long current = _baseStream.Position;
+                long modePosition = sectorLocation - (sectorLocation % Constants.CDROMSectorSize) + 15;
+
+                // Get the current sector mode
+                _baseStream.SeekIfPossible(modePosition, SeekOrigin.Begin);
+                _currentMode = _baseStream.GetSectorMode();
+
+                // Set the user data location variables
+                _userDataStart = _currentMode.GetUserDataStart();
+                _userDataEnd = _currentMode.GetUserDataEnd();
+                // _isoSectorSize = _currentMode.GetUserDataSize();
+
+                // Reset the stream position
+                _baseStream.SeekIfPossible(current, SeekOrigin.Begin);
+            }
+        }
+    }
+}

SabreTools.Data.Extensions/CFBExtensions.cs

@@ -2,7 +2,7 @@ using System.Text;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class CFB
+    public static class CFBExtensions
     {
         /// <summary>
         /// Decode a MIME-encoded stream name stored as a byte array
@@ -13,7 +13,7 @@ namespace SabreTools.Data.Extensions
         public static string? DecodeStreamName(this byte[]? input)
         {
             // Ignore invalid inputs
-            if (input == null)
+            if (input is null)
                 return null;
             else if (input.Length == 0)
                 return string.Empty;
@@ -28,7 +28,7 @@ namespace SabreTools.Data.Extensions
                 byte ch = input[p];
                 if ((ch == 0xe3 && input[p + 1] >= 0xa0) || (ch == 0xe4 && input[p + 1] < 0xa0))
                 {
-                    // UTF-8 encoding of 0x3800..0x47ff. 
+                    // UTF-8 encoding of 0x3800..0x47ff.
                     output[q++] = (byte)Mime2Utf(input[p + 2] & 0x7f);
                     output[q++] = (byte)Mime2Utf(input[p + 1] ^ 0xa0);
                     p += 3;
@@ -69,7 +69,7 @@ namespace SabreTools.Data.Extensions
         public static string? DecodeStreamName(this string? input)
         {
             // Ignore invalid inputs
-            if (input == null)
+            if (input is null)
                 return null;
             else if (input.Length == 0)
                 return string.Empty;
@@ -96,4 +96,4 @@ namespace SabreTools.Data.Extensions
             };
         }
     }
-}
+}

SabreTools.Data.Extensions/ISO9660Extensions.cs

@@ -0,0 +1,54 @@
+using SabreTools.Data.Models.ISO9660;
+using SabreTools.Numerics;
+
+namespace SabreTools.Data.Extensions
+{
+    public static class ISO9660Extensions
+    {
+        /// <summary>
+        /// Get the logical block size from a sector length
+        /// </summary>
+        /// <param name="vd">Volume descriptor containing block information</param>
+        /// <param name="sectorLength">Defined sector length</param>
+        /// <returns>Size of a logical block</returns>
+        public static short GetLogicalBlockSize(this VolumeDescriptor vd, short sectorLength)
+        {
+            BothInt16 blockSize;
+            if (vd is PrimaryVolumeDescriptor pvd)
+                blockSize = pvd.LogicalBlockSize;
+            else if (vd is SupplementaryVolumeDescriptor svd)
+                blockSize = svd.LogicalBlockSize;
+            else
+                return sectorLength;
+
+            // If the block size is inconsistent
+            if (!blockSize.IsValid)
+            {
+                bool leValid = BlockSizeValid(blockSize.LittleEndian, sectorLength);
+                bool beValid = BlockSizeValid(blockSize.BigEndian, sectorLength);
+
+                if (leValid && !beValid)
+                    blockSize = blockSize.LittleEndian;
+                else if (beValid && !leValid)
+                    blockSize = blockSize.BigEndian;
+                else
+                    return sectorLength;
+            }
+
+            // Validate logical block size
+            if (!BlockSizeValid(blockSize, sectorLength))
+                blockSize = sectorLength;
+
+            return blockSize;
+        }
+
+        /// <summary>
+        /// Indicates if a block size is valid
+        /// </summary>
+        /// <param name="blockSize">Block length to check</param>
+        /// <param name="sectorLength">Defined sector length</param>
+        /// <returns>True if the block length is valid, false otherwise</returns>
+        private static bool BlockSizeValid(short blockSize, short sectorLength)
+            => blockSize >= 512 && blockSize <= sectorLength && (blockSize & (blockSize - 1)) == 0;
+    }
+}

SabreTools.Data.Extensions/InstallShieldCabinetExtensions.cs

@@ -2,7 +2,7 @@ using SabreTools.Data.Models.InstallShieldCabinet;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class InstallShieldCabinet
+    public static class InstallShieldCabinetExtensions
     {
         #region File Descriptors
 
@@ -14,7 +14,7 @@ namespace SabreTools.Data.Extensions
         public static bool IsCompressed(this FileDescriptor? fileDescriptor)
         {
             // Ignore invalid descriptors
-            if (fileDescriptor == null)
+            if (fileDescriptor is null)
                 return true;
 
 #if NET20 || NET35
@@ -32,7 +32,7 @@ namespace SabreTools.Data.Extensions
         public static bool IsInvalid(this FileDescriptor? fileDescriptor)
         {
             // Ignore invalid descriptors
-            if (fileDescriptor == null)
+            if (fileDescriptor is null)
                 return true;
 
 #if NET20 || NET35
@@ -50,7 +50,7 @@ namespace SabreTools.Data.Extensions
         public static bool IsObfuscated(this FileDescriptor? fileDescriptor)
         {
             // Ignore invalid descriptors
-            if (fileDescriptor == null)
+            if (fileDescriptor is null)
                 return false;
 
 #if NET20 || NET35
@@ -68,7 +68,7 @@ namespace SabreTools.Data.Extensions
         public static bool IsSplit(this FileDescriptor? fileDescriptor)
         {
             // Ignore invalid descriptors
-            if (fileDescriptor == null)
+            if (fileDescriptor is null)
                 return false;
 
 #if NET20 || NET35
@@ -90,7 +90,7 @@ namespace SabreTools.Data.Extensions
         public static int GetMajorVersion(this Cabinet? cabinet)
         {
             // Ignore invalid cabinets
-            if (cabinet == null)
+            if (cabinet is null)
                 return -1;
 
             return cabinet.CommonHeader.GetMajorVersion();
@@ -104,7 +104,7 @@ namespace SabreTools.Data.Extensions
         public static int GetMajorVersion(this CommonHeader? commonHeader)
         {
             // Ignore invalid headers
-            if (commonHeader == null)
+            if (commonHeader is null)
                 return -1;
 
             uint majorVersion = commonHeader.Version;
@@ -124,4 +124,4 @@ namespace SabreTools.Data.Extensions
 
         #endregion
     }
-}
+}

SabreTools.Data.Extensions/NESCartExtensions.cs

@@ -0,0 +1,241 @@
+using SabreTools.Data.Models.NES;
+
+namespace SabreTools.Data.Extensions
+{
+    public static class NESCartExtensions
+    {
+        /// <summary>
+        /// Convert a <see cref="ConsoleType"/> value to string
+        /// </summary>
+        public static string FromConsoleType(this ConsoleType type)
+        {
+            return type switch
+            {
+                ConsoleType.StandardSystem => "Nintendo Entertainment System/Family Computer",
+                ConsoleType.VSUnisystem => "VS Unisystem",
+                ConsoleType.PlayChoice10 => "PlayChoice-10 (8 KB of Hint Screen data stored after CHR data)",
+                ConsoleType.ExtendedConsoleType => "Extended Console Type",
+                _ => $"Unknown {(byte)type}",
+            };
+        }
+
+        /// <summary>
+        /// Convert a <see cref="CPUPPUTiming"/> value to string
+        /// </summary>
+        public static string FromCPUPPUTiming(this CPUPPUTiming timing)
+        {
+            return timing switch
+            {
+                CPUPPUTiming.RP2C02 => "RP2C02 (NTSC NES)",
+                CPUPPUTiming.RP2C07 => "RP2C07 (Licensed PAL NES)",
+                CPUPPUTiming.MultipleRegion => "Multiple-region",
+                CPUPPUTiming.UA6538 => "UA6538 (Dendy)",
+                _ => $"Unknown {(byte)timing}",
+            };
+        }
+
+        /// <summary>
+        /// Convert a <see cref="DefaultExpansionDevice"/> value to string
+        /// </summary>
+        public static string FromDefaultExpansionDevice(this DefaultExpansionDevice device)
+        {
+            return device switch
+            {
+                DefaultExpansionDevice.Unspecified => "Unspecified",
+                DefaultExpansionDevice.StandardControllers => "Standard NES/Famicom controllers",
+                DefaultExpansionDevice.NESFourScore => "NES Four Score/Satellite with two additional standard controllers",
+                DefaultExpansionDevice.FamicomFourPlayersAdapter => "Famicom Four Players Adapter with two additional standard controllers using the 'simple' protocol",
+                DefaultExpansionDevice.VsSystem4016 => "Vs. System (1P via $4016)",
+                DefaultExpansionDevice.VsSystem4017 => "Vs. System (1P via $4017)",
+                DefaultExpansionDevice.Reserved06 => "Reserved (0x06)",
+                DefaultExpansionDevice.VsZapper => "Vs. Zapper",
+                DefaultExpansionDevice.Zapper4017 => "Zapper ($4017)",
+                DefaultExpansionDevice.TwoZappers => "Two Zappers",
+                DefaultExpansionDevice.BandaiHyperShotLightgun => "Bandai Hyper Shot Lightgun",
+                DefaultExpansionDevice.PowerPadSideA => "Power Pad Side A",
+                DefaultExpansionDevice.PowerPadSideB => "Power Pad Side B",
+                DefaultExpansionDevice.FamilyTrainerSideA => "Family Trainer Side A",
+                DefaultExpansionDevice.FamilyTrainerSideB => "Family Trainer Side B",
+                DefaultExpansionDevice.ArkanoidVausControllerNES => "Arkanoid Vaus Controller (NES)",
+                DefaultExpansionDevice.ArkanoidVausControllerFamicom => "Arkanoid Vaus Controller (Famicom)",
+                DefaultExpansionDevice.TwoVausControllersPlusFamicomDataRecorder => "Two Vaus Controllers plus Famicom Data Recorder",
+                DefaultExpansionDevice.KonamiHyperShotController => "Konami Hyper Shot Controller",
+                DefaultExpansionDevice.CoconutsPachinkoController => "Coconuts Pachinko Controller",
+                DefaultExpansionDevice.ExcitingBoxingPunchingBag => "Exciting Boxing Punching Bag (Blowup Doll)",
+                DefaultExpansionDevice.JissenMahjongController => "Jissen Mahjong Controller",
+                DefaultExpansionDevice.YonezawaPartyTap => "米澤 (Yonezawa) Party Tap",
+                DefaultExpansionDevice.OekaKidsTablet => "Oeka Kids Tablet",
+                DefaultExpansionDevice.SunsoftBarcodeBattler => "Sunsoft Barcode Battler",
+                DefaultExpansionDevice.MiraclePianoKeyboard => "Miracle Piano Keyboard",
+                DefaultExpansionDevice.PokkunMoguraaTapTapMat => "Pokkun Moguraa Tap-tap Mat (Whack-a-Mole Mat and Mallet)",
+                DefaultExpansionDevice.TopRider => "Top Rider (Inflatable Bicycle)",
+                DefaultExpansionDevice.DoubleFisted => "Double-Fisted (Requires or allows use of two controllers by one player)",
+                DefaultExpansionDevice.Famicom3DSystem => "Famicom 3D System",
+                DefaultExpansionDevice.DoremikkoKeyboard => "Doremikko Keyboard",
+                DefaultExpansionDevice.ROBGyromite => "R.O.B. Gyromite",
+                DefaultExpansionDevice.FamicomDataRecorder => "Famicom Data Recorder ('silent' keyboard)",
+                DefaultExpansionDevice.ASCIITurboFile => "ASCII Turbo File",
+                DefaultExpansionDevice.IGSStorageBattleBox => "IGS Storage Battle Box",
+                DefaultExpansionDevice.FamilyBASICKeyboardPlusFamicomDataRecorder => "Family BASIC Keyboard plus Famicom Data Recorder",
+                DefaultExpansionDevice.DongdaPECKeyboard => "东达 (Dōngdá) PEC Keyboard",
+                DefaultExpansionDevice.BitCorpBit79Keyboard => "普澤 (Pǔzé, a.k.a. Bit Corp.) Bit-79 Keyboard",
+                DefaultExpansionDevice.SuborKeyboard => "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard",
+                DefaultExpansionDevice.SuborKeyboardPlusMacroWinnersMouse => "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard plus Macro Winners Mouse",
+                DefaultExpansionDevice.SuborKeyboardPlusSuborMouse4016 => "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard plus Subor Mouse via $4016",
+                DefaultExpansionDevice.SNESMouse4016 => "SNES Mouse ($4016)",
+                DefaultExpansionDevice.Multicart => "Multicart",
+                DefaultExpansionDevice.TwoSNESControllers => "Two SNES controllers replacing the two standard NES controllers",
+                DefaultExpansionDevice.RacerMateBicycle => "RacerMate Bicycle",
+                DefaultExpansionDevice.UForce => "U-Force",
+                DefaultExpansionDevice.ROBStackUp => "R.O.B. Stack-Up",
+                DefaultExpansionDevice.CityPatrolmanLightgun => "City Patrolman Lightgun",
+                DefaultExpansionDevice.SharpC1CassetteInterface => "Sharp C1 Cassette Interface",
+                DefaultExpansionDevice.StandardControllerWithSwappedInputs => "Standard Controller with swapped Left-Right/Up-Down/B-A",
+                DefaultExpansionDevice.ExcaliburSudokuPad => "Excalibur Sudoku Pad",
+                DefaultExpansionDevice.ABLPinball => "ABL Pinball",
+                DefaultExpansionDevice.GoldenNuggetCasinoExtraButtons => "Golden Nugget Casino extra buttons",
+                DefaultExpansionDevice.KedaKeyboard => "科达 (Kēdá) Keyboard",
+                DefaultExpansionDevice.SuborKeyboardPlusSuborMouse4017 => "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard plus Subor Mouse via $4017",
+                DefaultExpansionDevice.PortTestController => "Port test controller",
+                DefaultExpansionDevice.BandaiMultiGamePlayerGamepad => "Bandai Multi Game Player Gamepad buttons",
+                DefaultExpansionDevice.VenomTVDanceMat => "Venom TV Dance Mat",
+                DefaultExpansionDevice.LGTVRemoteControl => "LG TV Remote Control",
+                DefaultExpansionDevice.FamicomNetworkController => "Famicom Network Controller",
+                DefaultExpansionDevice.KingFishingController => "King Fishing Controller",
+                DefaultExpansionDevice.CroakyKaraokeController => "Croaky Karaoke Controller",
+                DefaultExpansionDevice.KingwonKeyboard => "科王 (Kēwáng, a.k.a. Kingwon) Keyboard",
+                DefaultExpansionDevice.ZechengKeyboard => "泽诚 (Zéchéng) Keyboard",
+                DefaultExpansionDevice.SuborKeyboardPlusL90RotatedPS2Mouse4017 => "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard plus L90-rotated PS/2 mouse in $4017",
+                DefaultExpansionDevice.PS2KeyboardInUM6578PS2PortPS2Mouse4017 => "PS/2 Keyboard in UM6578 PS/2 port, PS/2 Mouse via $4017",
+                DefaultExpansionDevice.PS2MouseInUM6578PS2Port => "PS/2 Mouse in UM6578 PS/2 port",
+                DefaultExpansionDevice.YuxingMouse4016 => "裕兴 (Yùxìng) Mouse via $4016",
+                DefaultExpansionDevice.SuborKeyboardPlusYuxingMouse4016 => "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard plus 裕兴 (Yùxìng) Mouse mouse in $4016",
+                DefaultExpansionDevice.GigggleTVPump => "Gigggle TV Pump",
+                DefaultExpansionDevice.BBKKeyboardPlusR90RotatedPS2Mouse4017 => "步步高 (Bùbùgāo, a.k.a. BBK) Keyboard plus R90-rotated PS/2 mouse in $4017",
+                DefaultExpansionDevice.MagicalCooking => "Magical Cooking",
+                DefaultExpansionDevice.SNESMouse4017 => "SNES Mouse ($4017)",
+                DefaultExpansionDevice.Zapper4016 => "Zapper ($4016)",
+                DefaultExpansionDevice.ArkanoidVausControllerPrototype => "Arkanoid Vaus Controller (Prototype)",
+                DefaultExpansionDevice.TVMahjongGameController => "TV 麻雀 Game (TV Mahjong Game) Controller",
+                DefaultExpansionDevice.MahjongGekitouDensetsuController => "麻雀激闘伝説 (Mahjong Gekitou Densetsu) Controller",
+                DefaultExpansionDevice.SuborKeyboardPlusXInvertedPS2Mouse4017 => "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard plus X-inverted PS/2 mouse in $4017",
+                DefaultExpansionDevice.IBMPCXTKeyboard => "IBM PC/XT Keyboard",
+                DefaultExpansionDevice.SuborKeyboardPlusMegaBookMouse => "小霸王 (Xiǎobàwáng, a.k.a. Subor) Keyboard plus Mega Book Mouse",
+                _ => $"Unknown {(byte)device}",
+            };
+        }
+
+        /// <summary>
+        /// Convert a <see cref="ExtendedConsoleType"/> value to string
+        /// </summary>
+        public static string FromExtendedConsoleType(this ExtendedConsoleType type)
+        {
+            return type switch
+            {
+                ExtendedConsoleType.RegularSystem => "Regular NES/Famicom/Dendy",
+                ExtendedConsoleType.NintendoVsSystem => "Nintendo Vs. System",
+                ExtendedConsoleType.Playchoice10 => "Playchoice 10",
+                ExtendedConsoleType.RegularFamicloneDecimalMode => "Regular Famiclone, but with CPU that supports Decimal Mode",
+                ExtendedConsoleType.RegularNESWithEPSM => "Regular NES/Famicom with EPSM module or plug-through cartridge",
+                ExtendedConsoleType.VRTechnologyVT01 => "V.R. Technology VT01 with red/cyan STN palette",
+                ExtendedConsoleType.VRTechnologyVT02 => "V.R. Technology VT02",
+                ExtendedConsoleType.VRTechnologyVT03 => "V.R. Technology VT03",
+                ExtendedConsoleType.VRTechnologyVT09 => "V.R. Technology VT09",
+                ExtendedConsoleType.VRTechnologyVT32 => "V.R. Technology VT32",
+                ExtendedConsoleType.VRTechnologyVT369 => "V.R. Technology VT369",
+                ExtendedConsoleType.UMCUM6578 => "UMC UM6578",
+                ExtendedConsoleType.FamicomNetworkSystem => "Famicom Network System",
+                ExtendedConsoleType.ReservedD => "Reserved (0x0D)",
+                ExtendedConsoleType.ReservedE => "Reserved (0x0E)",
+                ExtendedConsoleType.ReservedF => "Reserved (0x0F)",
+                _ => $"Unknown {(byte)type}",
+            };
+        }
+
+        /// <summary>
+        /// Convert a <see cref="NametableArrangement"/> value to string
+        /// </summary>
+        public static string FromNametableArrangement(this NametableArrangement arrangement)
+        {
+            return arrangement switch
+            {
+                NametableArrangement.Vertical => "Vertical",
+                NametableArrangement.Horizontal => "Horizontal",
+                _ => $"Unknown {(byte)arrangement}",
+            };
+        }
+
+        /// <summary>
+        /// Convert a <see cref="TVSystem"/> value to string
+        /// </summary>
+        public static string FromTVSystem(this TVSystem system)
+        {
+            return system switch
+            {
+                TVSystem.NTSC => "NTSC",
+                TVSystem.PAL => "PAL",
+                _ => $"Unknown {(byte)system}",
+            };
+        }
+
+        /// <summary>
+        /// Convert a <see cref="TVSystemExtended"/> value to string
+        /// </summary>
+        public static string FromTVSystemExtended(this TVSystemExtended system)
+        {
+            return system switch
+            {
+                TVSystemExtended.NTSC => "NTSC",
+                TVSystemExtended.DualCompatible1 => "Dual-compatible (0x01)",
+                TVSystemExtended.PAL => "PAL",
+                TVSystemExtended.DualCompatible3 => "Dual-compatible (0x03)",
+                _ => $"Unknown {(byte)system}",
+            };
+        }
+
+        /// <summary>
+        /// Convert a <see cref="VsHardwareType"/> value to string
+        /// </summary>
+        public static string FromVsHardwareType(this VsHardwareType type)
+        {
+            return type switch
+            {
+                VsHardwareType.VsUnisystem => "Vs. Unisystem (normal)",
+                VsHardwareType.VsUnisystemRBIBaseballProtection => "Vs. Unisystem (RBI Baseball protection)",
+                VsHardwareType.VsUnisystemTKOBoxingProtection => "Vs. Unisystem (TKO Boxing protection)",
+                VsHardwareType.VsUnisystemSuperXeviousProtection => "Vs. Unisystem (Super Xevious protection)",
+                VsHardwareType.VsUnisystemVsIceClimberJapanProtection => "Vs. Unisystem (Vs. Ice Climber Japan protection)",
+                VsHardwareType.VsDualSystem => "Vs. Dual System (normal)",
+                VsHardwareType.VsDualSystemRaidOnBungelingBayProtection => "Vs. Dual System (Raid on Bungeling Bay protection)",
+                _ => $"Unknown {(byte)type}",
+            };
+        }
+
+        /// <summary>
+        /// Convert a <see cref="VsSystemType"/> value to string
+        /// </summary>
+        public static string FromVsSystemType(this VsSystemType type)
+        {
+            return type switch
+            {
+                VsSystemType.AnyRP2C03RC2C03Variant => "Any RP2C03/RC2C03 variant",
+                VsSystemType.Reserved1 => "Reserved (0x01)",
+                VsSystemType.RP2C040001 => "RP2C04-0001",
+                VsSystemType.RP2C040002 => "RP2C04-0002",
+                VsSystemType.RP2C040003 => "RP2C04-0003",
+                VsSystemType.RP2C040004 => "RP2C04-0004",
+                VsSystemType.Reserved6 => "Reserved (0x06)",
+                VsSystemType.Reserved7 => "Reserved (0x07)",
+                VsSystemType.RC2C0501 => "RC2C05-01 (signature unknown)",
+                VsSystemType.RC2C0502 => "RC2C05-02 ($2002 AND $3F =$3D)",
+                VsSystemType.RC2C0503 => "RC2C05-03 ($2002 AND $1F =$1C)",
+                VsSystemType.RC2C0504 => "RC2C05-04 ($2002 AND $1F =$1B)",
+                VsSystemType.ReservedC => "Reserved (0x0C)",
+                VsSystemType.ReservedD => "Reserved (0x0D)",
+                VsSystemType.ReservedE => "Reserved (0x0E)",
+                VsSystemType.ReservedF => "Reserved (0x0F)",
+                _ => $"Unknown {(byte)type}",
+            };
+        }
+    }
+}

SabreTools.Data.Extensions/NewExecutableExtensions.cs

@@ -2,7 +2,7 @@ using SabreTools.Data.Models.NewExecutable;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class NewExecutable
+    public static class NewExecutableExtensions
     {
         /// <summary>
         /// Determine if a resource type information entry is an integer or offset

SabreTools.Data.Extensions/NintendoDiscExtensions.cs

@@ -0,0 +1,77 @@
+using SabreTools.Data.Models.NintendoDisc;
+using SabreTools.Numerics.Extensions;
+
+namespace SabreTools.Data.Extensions
+{
+    public static class NintendoDiscExtensions
+    {
+        /// <summary>
+        /// Get the platform associated with a disc header
+        /// </summary>
+        public static Platform GetPlatform(this DiscHeader header)
+        {
+            if (header.WiiMagic == Constants.WiiMagicWord)
+                return Platform.Wii;
+            else if (header.GCMagic == Constants.GCMagicWord)
+                return Platform.GameCube;
+            else if (header.GameId.Length >= 1 && IsGameCubeTitleType(header.GameId[0]))
+                return Platform.GameCube;
+            else
+                return Platform.Unknown;
+        }
+
+        /// <summary>
+        /// Get the platform associated with a disc header
+        /// </summary>
+        public static Platform GetPlatform(this byte[] header)
+        {
+            // Check for Wii magic bytes
+            if (header.Length >= 0x1C)
+            {
+                int offset = 0x18;
+                uint magic = header.ReadUInt32BigEndian(ref offset);
+                if (magic == Constants.WiiMagicWord)
+                    return Platform.Wii;
+            }
+
+            // Check for GameCube magic bytes
+            if (header.Length >= 0x20)
+            {
+                int offset = 0x1C;
+                uint magic = header.ReadUInt32BigEndian(ref offset);
+                if (magic == Constants.GCMagicWord)
+                    return Platform.GameCube;
+            }
+
+            // Check for a valid game ID
+            if (header.Length >= 4)
+            {
+                for (int i = 0; i < 4; i++)
+                {
+                    byte c = header[i];
+                    if (!((c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9')))
+                        return Platform.Unknown;
+                }
+
+                return Platform.GameCube;
+            }
+
+            return Platform.Unknown;
+        }
+
+        /// <summary>
+        /// Returns true if the GameId first character is a known GameCube title type prefix.
+        /// Used as a fallback when the GC magic word is absent from the disc image.
+        /// </summary>
+        public static bool IsGameCubeTitleType(this char c)
+            => c == 'G' || c == 'D' || c == 'R';
+
+        /// <summary>
+        /// Returns true if the byte is a known Nintendo disc title type code
+        /// (first byte of the 6-char GameId, e.g. 'G'=GameCube, 'R'=GameCube,
+        ///  'D'=GameCube demo, 'S'=Wii, 'F'=Wii channel)
+        /// </summary>
+        public static bool IsNintendoDiscTitleType(this byte b)
+            => b == 'G' || b == 'D' || b == 'R' || b == 'S' || b == 'F';
+    }
+}

SabreTools.Data.Extensions/OperaFSExtensions.cs

@@ -0,0 +1,78 @@
+using SabreTools.Data.Models.OperaFS;
+using SabreTools.Matching;
+
+namespace SabreTools.Data.Extensions
+{
+    public static class OperaFSExtensions
+    {
+        /// <summary>
+        /// Compare two DirectoryDescriptor objects
+        /// </summary>
+        /// <param name="dir1">The provided DirectoryDescriptor</param>
+        /// <param name="dir2">The DirectoryDescriptor to compare against</param>
+        /// <returns>True if all fields are equal, otherwise false</returns>
+        public static bool EqualsExactly(this DirectoryDescriptor dir1, DirectoryDescriptor dir2)
+        {
+            if (dir1.NextBlock != dir2.NextBlock)
+                return false;
+            if (dir1.PreviousBlock != dir2.PreviousBlock)
+                return false;
+            if (dir1.Flags != dir2.Flags)
+                return false;
+            if (dir1.FirstFreeByte != dir2.FirstFreeByte)
+                return false;
+            if (dir1.FirstEntryOffset != dir2.FirstEntryOffset)
+                return false;
+            if (dir1.DirectoryRecords.Length != dir2.DirectoryRecords.Length)
+                return false;
+
+            for (int i = 0; i < dir1.DirectoryRecords.Length; i++)
+            {
+                if (!dir1.DirectoryRecords[i].EqualsExactly(dir2.DirectoryRecords[i]))
+                    return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Compare two DirectoryRecord objects
+        /// </summary>
+        /// <param name="dir1">The provided DirectoryRecord</param>
+        /// <param name="dir2">The DirectoryRecord to compare against</param>
+        /// <returns>True if all fields are equal, otherwise false</returns>
+        public static bool EqualsExactly(this DirectoryRecord dr1, DirectoryRecord dr2)
+        {
+            if ((byte)dr1.DirectoryRecordFlags != (byte)dr2.DirectoryRecordFlags)
+                return false;
+            if (!dr1.UniqueIdentifier.EqualsExactly(dr2.UniqueIdentifier))
+                return false;
+            if (!dr1.Type.EqualsExactly(dr2.Type))
+                return false;
+            if (dr1.BlockSize != dr2.BlockSize)
+                return false;
+            if (dr1.ByteCount != dr2.ByteCount)
+                return false;
+            if (dr1.BlockCount != dr2.BlockCount)
+                return false;
+            if (dr1.Burst != dr2.Burst)
+                return false;
+            if (dr1.Gap != dr2.Gap)
+                return false;
+            if (!dr1.Filename.EqualsExactly(dr2.Filename))
+                return false;
+            if (dr1.LastAvatarIndex != dr2.LastAvatarIndex)
+                return false;
+            if (dr1.AvatarList.Length != dr2.AvatarList.Length)
+                return false;
+
+            for (int i = 0; i < dr1.AvatarList.Length; i++)
+            {
+                if (dr1.AvatarList[i] != dr2.AvatarList[i])
+                    return false;
+            }
+
+            return true;
+        }
+    }
+}

SabreTools.Data.Extensions/PortableExecutableExtensions.cs

@@ -0,0 +1,98 @@
+using System;
+using SabreTools.Data.Models.COFF;
+
+namespace SabreTools.Data.Extensions
+{
+    // TODO: Add tests
+    public static class PortableExecutableExtensions
+    {
+        /// <summary>
+        /// Convert a relative virtual address to a physical one
+        /// </summary>
+        /// <param name="rva">Relative virtual address to convert</param>
+        /// <param name="sections">Array of sections to check against</param>
+        /// <returns>Physical address, 0 on error</returns>
+        public static uint ConvertVirtualAddress(this uint rva, SectionHeader[] sections)
+        {
+            // If we have an invalid section table, we can't do anything
+            if (sections.Length == 0)
+                return 0;
+
+            // If the RVA is 0, we just return 0 because it's invalid
+            if (rva == 0)
+                return 0;
+
+            // If the RVA matches a section start exactly, use that
+            var matchingSection = Array.Find(sections, s => s.VirtualAddress == rva);
+            if (matchingSection is not null)
+                return rva - matchingSection.VirtualAddress + matchingSection.PointerToRawData;
+
+            // Loop through all of the sections
+            uint maxVirtualAddress = 0, maxRawPointer = 0;
+            for (int i = 0; i < sections.Length; i++)
+            {
+                // If the section "starts" at 0, just skip it
+                var section = sections[i];
+                if (section.PointerToRawData == 0)
+                    continue;
+
+                // If the virtual address is greater than the RVA
+                if (rva < section.VirtualAddress)
+                    continue;
+
+                // Cache the maximum matching section data, in case of a miss
+                if (rva >= section.VirtualAddress)
+                {
+                    maxVirtualAddress = section.VirtualAddress;
+                    maxRawPointer = section.PointerToRawData;
+                }
+
+                // Attempt to derive the physical address from the current section
+                if (section.VirtualSize != 0 && rva <= section.VirtualAddress + section.VirtualSize)
+                    return rva - section.VirtualAddress + section.PointerToRawData;
+                else if (section.SizeOfRawData != 0 && rva <= section.VirtualAddress + section.SizeOfRawData)
+                    return rva - section.VirtualAddress + section.PointerToRawData;
+            }
+
+            return maxRawPointer != 0 ? rva - maxVirtualAddress + maxRawPointer : 0;
+        }
+
+        /// <summary>
+        /// Find the section a revlative virtual address lives in
+        /// </summary>
+        /// <param name="rva">Relative virtual address to convert</param>
+        /// <param name="sections">Array of sections to check against</param>
+        /// <returns>Section index, null on error</returns>
+        public static int ContainingSectionIndex(this uint rva, SectionHeader[] sections)
+        {
+            // If we have an invalid section table, we can't do anything
+            if (sections is null || sections.Length == 0)
+                return -1;
+
+            // If the RVA is 0, we just return -1 because it's invalid
+            if (rva == 0)
+                return -1;
+
+            // Loop through all of the sections
+            for (int i = 0; i < sections.Length; i++)
+            {
+                // If the section "starts" at 0, just skip it
+                var section = sections[i];
+                if (section.PointerToRawData == 0)
+                    continue;
+
+                // If the virtual address is greater than the RVA
+                if (rva < section.VirtualAddress)
+                    continue;
+
+                // Attempt to derive the physical address from the current section
+                if (section.VirtualSize != 0 && rva <= section.VirtualAddress + section.VirtualSize)
+                    return i;
+                else if (section.SizeOfRawData != 0 && rva <= section.VirtualAddress + section.SizeOfRawData)
+                    return i;
+            }
+
+            return -1;
+        }
+    }
+}

SabreTools.Data.Extensions/README.MD

@@ -0,0 +1,24 @@
+# SabreTools.Data.Extensions
+
+This library contains extension methods related to models. These extensions are used in both reader and wrapper code.
+
+## Provided Extension Classes
+
+| Class Name | Applicable Namespace |
+| --- | --- |
+| `Atari7800CartExtensions` | `SabreTools.Data.Models.Atari7800` |
+| `AtariLynxCartExtensions` | `SabreTools.Data.Models.AtariLynx` |
+| `BSPExtensions` | `SabreTools.Data.Models.BSP` |
+| `CDROMExtensions` | `SabreTools.Data.Models.CDROM` |
+| `CFBExtensions` | `SabreTools.Data.Models.CFB` |
+| `InstallShieldCabinetExtensions` | `SabreTools.Data.Models.InstallShieldCabinet` |
+| `ISO9660Extensions` | `SabreTools.Data.Models.ISO9660` |
+| `MetadataExtensions` | `SabreTools.Data.Models.Metadata` |
+| `NESCartExtensions` | `SabreTools.Data.Models.NES` |
+| `NewExecutableExtensions` | `SabreTools.Data.Models.NewExecutable` |
+| `PortableExecutableExtensions` | `SabreTools.Data.Models.COFF` |
+| `TypeLengthValueExtensions` | `SabreTools.Data.Models.ASN1` and `SabreTools.ObjectIdentifier` |
+| `VBSPExtensions` | `SabreTools.Data.Models.BSP` |
+| `WiseScriptExtensions` | `SabreTools.Data.Models.WiseInstaller` |
+| `XboxExecutableExtensions` | `SabreTools.Data.Models.XboxExecutable` |
+| `XZExtensions` | `SabreTools.Data.Models.XZ` |

SabreTools.Data.Extensions/SabreTools.Data.Extensions.csproj

@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <!-- Assembly Properties -->
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <CheckEolTargetFramework>false</CheckEolTargetFramework>
+        <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+        <IncludeSymbols>true</IncludeSymbols>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <Version>3.2.0</Version>
+
+        <!-- Package Properties -->
+        <Authors>Matt Nadareski</Authors>
+        <Description>Extension methods related to models</Description>
+        <Copyright>Copyright (c) Matt Nadareski 2019-2026</Copyright>
+        <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <RepositoryUrl>https://github.com/SabreTools/SabreTools.Serialization</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>models extensions conversion</PackageTags>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="README.md" Pack="true" PackagePath="" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="NetLegacySupport.Numerics" Version="1.0.1" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))" />
+        <PackageReference Include="SabreTools.IO" Version="2.3.0" />
+     </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\SabreTools.Data.Models\SabreTools.Data.Models.csproj" />
+        <ProjectReference Include="..\SabreTools.ObjectIdentifier\SabreTools.ObjectIdentifier.csproj" />
+    </ItemGroup>
+
+</Project>

SabreTools.Data.Extensions/TypeLengthValueExtensions.cs

@@ -2,18 +2,18 @@ using System;
 using System.Numerics;
 using System.Text;
 using SabreTools.Data.Models.ASN1;
-using SabreTools.Data.ObjectIdentifier;
+using SabreTools.ObjectIdentifier;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class TypeLengthValue
+    public static class TypeLengthValueExtensions
     {
         /// <summary>
         /// Format a TypeLengthValue as a string
         /// </summary>
         /// <param name="paddingLevel">Padding level of the item when formatting</param>
         /// <returns>String representing the TypeLengthValue, if possible</returns>
-        public static string Format(this Data.Models.ASN1.TypeLengthValue tlv, int paddingLevel = 0)
+        public static string Format(this TypeLengthValue tlv, int paddingLevel = 0)
         {
             // Create the left-padding string
             string padding = new(' ', paddingLevel);
@@ -38,7 +38,7 @@ namespace SabreTools.Data.Extensions
             if (tlv.Type.HasFlag(ASN1Type.V_ASN1_CONSTRUCTED))
 #endif
             {
-                if (tlv.Value is not SabreTools.Data.Models.ASN1.TypeLengthValue[] valueAsObjectArray)
+                if (tlv.Value is not TypeLengthValue[] valueAsObjectArray)
                 {
                     formatBuilder.Append(", Value: [INVALID DATA TYPE]");
                     return formatBuilder.ToString();
@@ -148,6 +148,27 @@ namespace SabreTools.Data.Extensions
                     formatBuilder.Append($", Value: {Encoding.Unicode.GetString(valueAsByteArray)}");
                     break;
 
+                // Unimplemented
+                case ASN1Type.V_ASN1_EOC:
+                case ASN1Type.V_ASN1_NULL:
+                case ASN1Type.V_ASN1_OBJECT_DESCRIPTOR:
+                case ASN1Type.V_ASN1_EXTERNAL:
+                case ASN1Type.V_ASN1_REAL:
+                case ASN1Type.V_ASN1_ENUMERATED:
+                case ASN1Type.V_ASN1_SEQUENCE:
+                case ASN1Type.V_ASN1_SET:
+                case ASN1Type.V_ASN1_NUMERICSTRING:
+                case ASN1Type.V_ASN1_VIDEOTEXSTRING:
+                case ASN1Type.V_ASN1_GENERALIZEDTIME:
+                case ASN1Type.V_ASN1_GRAPHICSTRING:
+                case ASN1Type.V_ASN1_ISO64STRING:
+                case ASN1Type.V_ASN1_GENERALSTRING:
+                case ASN1Type.V_ASN1_UNIVERSALSTRING:
+                case ASN1Type.V_ASN1_PRIMITIVE_TAG:
+                case ASN1Type.V_ASN1_CONSTRUCTED:
+                case ASN1Type.V_ASN1_APPLICATION:
+                case ASN1Type.V_ASN1_CONTEXT_SPECIFIC:
+                case ASN1Type.V_ASN1_PRIVATE:
                 default:
                     formatBuilder.Append($", Value: {BitConverter.ToString(valueAsByteArray).Replace('-', ' ')}");
                     break;

SabreTools.Data.Extensions/VBSPExtensions.cs

@@ -0,0 +1,82 @@
+using SabreTools.Data.Models.BSP;
+
+namespace SabreTools.Data.Extensions
+{
+    public static class VBSPExtensions
+    {
+        /// <summary>
+        /// Convert a <see cref="VbspLumpType"/> value to string
+        /// </summary>
+        public static string FromVbspLumpType(this VbspLumpType type)
+        {
+            return type switch
+            {
+                VbspLumpType.LUMP_ENTITIES => " - LUMP_ENTITIES",
+                VbspLumpType.LUMP_PLANES => " - LUMP_PLANES",
+                VbspLumpType.LUMP_TEXTURES => " - LUMP_TEXDATA",
+                VbspLumpType.LUMP_VERTICES => " - LUMP_VERTEXES",
+                VbspLumpType.LUMP_VISIBILITY => " - LUMP_VISIBILITY",
+                VbspLumpType.LUMP_NODES => " - LUMP_NODES",
+                VbspLumpType.LUMP_TEXINFO => " - LUMP_TEXINFO",
+                VbspLumpType.LUMP_FACES => " - LUMP_FACES",
+                VbspLumpType.LUMP_LIGHTING => " - LUMP_LIGHTING",
+                VbspLumpType.LUMP_CLIPNODES => " - LUMP_OCCLUSION",
+                VbspLumpType.LUMP_LEAVES => " - LUMP_LEAVES",
+                VbspLumpType.LUMP_MARKSURFACES => " - LUMP_FACEIDS",
+                VbspLumpType.LUMP_EDGES => " - LUMP_EDGES",
+                VbspLumpType.LUMP_SURFEDGES => " - LUMP_SURFEDGES",
+                VbspLumpType.LUMP_MODELS => " - LUMP_MODELS",
+                VbspLumpType.LUMP_WORLDLIGHTS => " - LUMP_WORLDLIGHTS",
+                VbspLumpType.LUMP_LEAFFACES => " - LUMP_LEAFFACES",
+                VbspLumpType.LUMP_LEAFBRUSHES => " - LUMP_LEAFBRUSHES",
+                VbspLumpType.LUMP_BRUSHES => " - LUMP_BRUSHES",
+                VbspLumpType.LUMP_BRUSHSIDES => " - LUMP_BRUSHSIDES",
+                VbspLumpType.LUMP_AREAS => " - LUMP_AREAS",
+                VbspLumpType.LUMP_AREAPORTALS => " - LUMP_AREAPORTALS",
+                VbspLumpType.LUMP_PORTALS => " - LUMP_PORTALS / LUMP_UNUSED0 / LUMP_PROPCOLLISION",
+                VbspLumpType.LUMP_CLUSTERS => " - LUMP_CLUSTERS / LUMP_UNUSED1 / LUMP_PROPHULLS",
+                VbspLumpType.LUMP_PORTALVERTS => " - LUMP_PORTALVERTS / LUMP_UNUSED2 / LUMP_FAKEENTITIES / LUMP_PROPHULLVERTS",
+                VbspLumpType.LUMP_CLUSTERPORTALS => " - LUMP_CLUSTERPORTALS / LUMP_UNUSED3 / LUMP_PROPTRIS",
+                VbspLumpType.LUMP_DISPINFO => " - LUMP_DISPINFO",
+                VbspLumpType.LUMP_ORIGINALFACES => " - LUMP_ORIGINALFACES",
+                VbspLumpType.LUMP_PHYSDISP => " - LUMP_PHYSDISP",
+                VbspLumpType.LUMP_PHYSCOLLIDE => " - LUMP_PHYSCOLLIDE",
+                VbspLumpType.LUMP_VERTNORMALS => " - LUMP_VERTNORMALS",
+                VbspLumpType.LUMP_VERTNORMALINDICES => " - LUMP_VERTNORMALINDICES",
+                VbspLumpType.LUMP_DISP_LIGHTMAP_ALPHAS => " - LUMP_DISP_LIGHTMAP_ALPHAS",
+                VbspLumpType.LUMP_DISP_VERTS => " - LUMP_DISP_VERTS",
+                VbspLumpType.LUMP_DISP_LIGHTMAP_SAMPLE_POSITIONS => " - LUMP_DISP_LIGHTMAP_SAMPLE_POSITIONS",
+                VbspLumpType.LUMP_GAME_LUMP => " - LUMP_GAME_LUMP",
+                VbspLumpType.LUMP_LEAFWATERDATA => " - LUMP_LEAFWATERDATA",
+                VbspLumpType.LUMP_PRIMITIVES => " - LUMP_PRIMITIVES",
+                VbspLumpType.LUMP_PRIMVERTS => " - LUMP_PRIMVERTS",
+                VbspLumpType.LUMP_PRIMINDICES => " - LUMP_PRIMINDICES",
+                VbspLumpType.LUMP_PAKFILE => " - LUMP_PAKFILE",
+                VbspLumpType.LUMP_CLIPPORTALVERTS => " - LUMP_CLIPPORTALVERTS",
+                VbspLumpType.LUMP_CUBEMAPS => " - LUMP_CUBEMAPS",
+                VbspLumpType.LUMP_TEXDATA_STRING_DATA => " - LUMP_TEXDATA_STRING_DATA",
+                VbspLumpType.LUMP_TEXDATA_STRING_TABLE => " - LUMP_TEXDATA_STRING_TABLE",
+                VbspLumpType.LUMP_OVERLAYS => " - LUMP_OVERLAYS",
+                VbspLumpType.LUMP_LEAFMINDISTTOWATER => " - LUMP_LEAFMINDISTTOWATER",
+                VbspLumpType.LUMP_FACE_MACRO_TEXTURE_INFO => " - LUMP_FACE_MACRO_TEXTURE_INFO",
+                VbspLumpType.LUMP_DISP_TRIS => " - LUMP_DISP_TRIS",
+                VbspLumpType.LUMP_PHYSCOLLIDESURFACE => " - LUMP_PHYSCOLLIDESURFACE / LUMP_PROP_BLOB",
+                VbspLumpType.LUMP_WATEROVERLAYS => " - LUMP_WATEROVERLAYS",
+                VbspLumpType.LUMP_LIGHTMAPPAGES => " - LUMP_LIGHTMAPPAGES / LUMP_LEAF_AMBIENT_INDEX_HDR",
+                VbspLumpType.LUMP_LIGHTMAPPAGEINFOS => " - LUMP_LIGHTMAPPAGEINFOS / LUMP_LEAF_AMBIENT_INDEX",
+                VbspLumpType.LUMP_LIGHTING_HDR => " - LUMP_LIGHTING_HDR",
+                VbspLumpType.LUMP_WORLDLIGHTS_HDR => " - LUMP_WORLDLIGHTS_HDR",
+                VbspLumpType.LUMP_LEAF_AMBIENT_LIGHTING_HDR => " - LUMP_LEAF_AMBIENT_LIGHTING_HDR",
+                VbspLumpType.LUMP_LEAF_AMBIENT_LIGHTING => " - LUMP_LEAF_AMBIENT_LIGHTING",
+                VbspLumpType.LUMP_XZIPPAKFILE => " - LUMP_XZIPPAKFILE",
+                VbspLumpType.LUMP_FACES_HDR => " - LUMP_FACES_HDR",
+                VbspLumpType.LUMP_MAP_FLAGS => " - LUMP_MAP_FLAGS",
+                VbspLumpType.LUMP_OVERLAY_FADES => " - LUMP_OVERLAY_FADES",
+                VbspLumpType.LUMP_OVERLAY_SYSTEM_LEVELS => " - LUMP_OVERLAY_SYSTEM_LEVELS",
+                VbspLumpType.LUMP_PHYSLEVEL => " - LUMP_PHYSLEVEL",
+                VbspLumpType.LUMP_DISP_MULTIBLEND => " - LUMP_DISP_MULTIBLEND",
+                _ => string.Empty,
+            };
+        }
+    }
+}

SabreTools.Data.Extensions/WiseScriptExtensions.cs

@@ -2,7 +2,7 @@ using System.Text.RegularExpressions;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class WiseScript
+    public static class WiseScriptExtensions
     {
         /// <summary>
         /// Convert a Wise function ID to the formal action name
@@ -57,8 +57,10 @@ namespace SabreTools.Data.Extensions
 
                 // External DLL
                 null => null,
+#pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute'
                 _ => Regex.IsMatch(functionId, @"^f[0-9]{1,2}$") ? $"UNDEFINED {functionId}" : $"External: {functionId}",
+#pragma warning restore SYSLIB1045
             };
         }
     }
-}
+}

SabreTools.Data.Extensions/XZExtensions.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class XZ
+    public static class XZExtensions
     {
         /// <summary>
         /// Decode a value from a variable-length integer

SabreTools.Data.Extensions/XboxExecutableExtensions.cs

@@ -0,0 +1,32 @@
+using System;
+using SabreTools.Numerics.Extensions;
+
+namespace SabreTools.Data.Extensions
+{
+    public static class XboxExecutableExtensions
+    {
+        /// <summary>
+        /// Convert a UInt32 to a formatted XBE title ID
+        /// </summary>
+        public static string ToFormattedXBETitleID(this uint value)
+        {
+            // Convert to a byte array
+            byte[] data = BitConverter.GetBytes(value);
+
+            // Create the prefix
+            string prefix1 = (0x41 <= data[3] && data[3] <= 0x5A) || (0x30 <= data[3] && data[3] <= 0x39)
+                ? $"{(char)data[3]}"
+                : $"{data[3]:X2}";
+            string prefix2 = (0x41 <= data[2] && data[2] <= 0x5A) || (0x30 <= data[2] && data[2] <= 0x39)
+                ? $"{(char)data[2]}"
+                : $"{data[2]:X2}";
+
+            // Create the serial
+            int offset = 0;
+            ushort serial = data.ReadUInt16LittleEndian(ref offset);
+
+            // Assemble and return
+            return $"{prefix1}{prefix2}-{serial:D3}";
+        }
+    }
+}

SabreTools.Data.Extensions/ZArchiveExtensions.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Text;
+using SabreTools.Data.Models.ZArchive;
+
+namespace SabreTools.Data.Extensions
+{
+    public static class ZArchiveExtensions
+    {
+        /// <summary>
+        /// Retrieves the name of the specified node from the NameTable
+        /// </summary>
+        /// <param name="node">Node in the file tree</param>
+        /// <param name="nameTable">ZArchive NameTable</param>
+        /// <returns>UTF-8 string representing node's name</returns>
+        public static string? GetName(this FileDirectoryEntry node, NameTable nameTable)
+        {
+            // Check for a valid offset into the NameTable
+            uint nameOffset = node.NameOffsetAndTypeFlag & Constants.RootNode;
+            if (nameOffset == Constants.RootNode)
+                return null;
+
+            // Get the index into the name table
+            var index = Array.IndexOf(nameTable.NameTableOffsets, nameOffset);
+            if (index < 0)
+                return null;
+
+            // Get the name entry for the requested index
+            var nameEntry = nameTable.NameEntries[index];
+            if (nameEntry is null)
+                return null;
+
+            // Decode name to UTF-8
+            return Encoding.UTF8.GetString(nameEntry.NodeName);
+        }
+    }
+}

SabreTools.Data.Models/AACS/CopyrightRecord.cs

@@ -11,6 +11,6 @@ namespace SabreTools.Data.Models.AACS
         /// Null-terminated ASCII string representing the copyright
         /// </summary>
         [MarshalAs(UnmanagedType.LPStr)]
-        public string? Copyright;
+        public string Copyright = string.Empty;
     }
-}
+}

SabreTools.Data.Models/AACS/DriveRevocationListEntry.cs

@@ -20,6 +20,6 @@ namespace SabreTools.Data.Models.AACS
         /// case of a non-zero Range value).
         /// </summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-        public byte[]? DriveID;
+        public byte[] DriveID = new byte[6];
     }
-}
+}

SabreTools.Data.Models/AACS/DriveRevocationListRecord.cs

@@ -4,7 +4,7 @@ namespace SabreTools.Data.Models.AACS
     /// A properly formatted type 3 or type 4 Media Key Block contains exactly
     /// one Drive Revocation List Record. It follows the Host Revocation List
     /// Record, although it may not immediately follow it.
-    /// 
+    ///
     /// The Drive Revocation List Record is identical to the Host Revocation
     /// List Record, except it has type 2016, and it contains Drive Revocation
     /// List Entries, not Host Revocation List Entries. The Drive Revocation List
@@ -21,6 +21,6 @@ namespace SabreTools.Data.Models.AACS
         /// <summary>
         /// Revocation list entries
         /// </summary>
-        public DriveRevocationSignatureBlock[]? SignatureBlocks { get; set; }
+        public DriveRevocationSignatureBlock[] SignatureBlocks { get; set; } = [];
     }
-}
+}

SabreTools.Data.Models/AACS/DriveRevocationSignatureBlock.cs

@@ -12,6 +12,6 @@ namespace SabreTools.Data.Models.AACS
         /// A list of 8-byte Host Drive List Entry fields, the length of this
         /// list being equal to the number in the signature block.
         /// </summary>
-        public DriveRevocationListEntry[]? EntryFields { get; set; }
+        public DriveRevocationListEntry[] EntryFields { get; set; } = [];
     }
-}
+}

SabreTools.Data.Models/AACS/EndOfMediaKeyBlockRecord.cs

@@ -18,6 +18,7 @@ namespace SabreTools.Data.Models.AACS
         /// determines that the signature does not verify or is omitted, it
         /// must refuse to use the Media Key.
         /// </summary>
-        public byte[]? SignatureData { get; set; }
+        /// <remarks><see cref="RecordLength"/>-4 bytes</remarks>
+        public byte[] SignatureData { get; set; } = [];
     }
-}
+}

SabreTools.Data.Models/AACS/Enums.cs

@@ -66,4 +66,4 @@ namespace SabreTools.Data.Models.AACS
         VerifyMediaKey_AACS2 = 0x86,
         EmptyRecord0xF8_AACS2 = 0xF8,
     }
-}
+}

SabreTools.Data.Models/AACS/ExplicitSubsetDifferenceRecord.cs

@@ -6,6 +6,6 @@ namespace SabreTools.Data.Models.AACS
         /// <summary>
         /// In this record, each subset-difference is encoded with 5 bytes.
         /// </summary>
-        public SubsetDifference[]? SubsetDifferences { get; set; }
+        public SubsetDifference[] SubsetDifferences { get; set; } = [];
     }
-}
+}

SabreTools.Data.Models/AACS/GenericRecord.cs

@@ -8,6 +8,6 @@ namespace SabreTools.Data.Models.AACS
         /// <summary>
         /// Unparsed data comprising the record after the header
         /// </summary>
-        public byte[]? Data { get; set; }
+        public byte[] Data { get; set; } = [];
     }
-}
+}

SabreTools.Data.Models/AACS/HostRevocationListEntry.cs

@@ -20,6 +20,6 @@ namespace SabreTools.Data.Models.AACS
         /// Range value).
         /// </summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-        public byte[]? HostID;
+        public byte[] HostID = new byte[6];
     }
-}
+}

SabreTools.Data.Models/AACS/HostRevocationListRecord.cs

@@ -24,6 +24,6 @@ namespace SabreTools.Data.Models.AACS
         /// <summary>
         /// Revocation list entries
         /// </summary>
-        public HostRevocationSignatureBlock[]? SignatureBlocks { get; set; }
+        public HostRevocationSignatureBlock[] SignatureBlocks { get; set; } = [];
     }
-}
+}

SabreTools.Data.Models/AACS/HostRevocationSignatureBlock.cs

@@ -12,6 +12,6 @@ namespace SabreTools.Data.Models.AACS
         /// A list of 8-byte Host Revocation List Entry fields, the length of this
         /// list being equal to the number in the signature block.
         /// </summary>
-        public HostRevocationListEntry[]? EntryFields { get; set; }
+        public HostRevocationListEntry[] EntryFields { get; set; } = [];
     }
-}
+}

SabreTools.Data.Models/AACS/MediaKeyBlock.cs

@@ -9,6 +9,6 @@ namespace SabreTools.Data.Models.AACS
         /// <summary>
         /// Records
         /// </summary>
-        public Record[]? Records { get; set; }
+        public Record[] Records { get; set; } = [];
     }
-}
+}

SabreTools.Data.Models/AACS/MediaKeyDataRecord.cs

@@ -13,6 +13,6 @@ namespace SabreTools.Data.Models.AACS
         /// record. This 16 bytes is the ciphertext value C in the media
         /// key calculation.
         /// </summary>
-        public byte[][]? MediaKeyData { get; set; }
+        public byte[][] MediaKeyData { get; set; } = [];
     }
-}
+}

SabreTools.Data.Models/AACS/Record.cs

@@ -1,9 +1,11 @@
+using SabreTools.Numerics;
+
 namespace SabreTools.Data.Models.AACS
 {
     /// <summary>
     /// Each Record begins with a one-byte Record Type field, followed by a
-    /// three-byte Record Length field. 
-    /// 
+    /// three-byte Record Length field.
+    ///
     /// The following subsections describe the currently defined Record types,
     /// and how a device processes each. All multi-byte integers, including
     /// the length field, are “Big Endian”; in other words, the most significant
@@ -23,6 +25,6 @@ namespace SabreTools.Data.Models.AACS
         /// fields themselves. Record lengths are always multiples of 4 bytes.
         /// </summary>
         // <remarks>UInt24 not UInt32</remarks>
-        public uint RecordLength { get; set; }
+        public UInt24 RecordLength { get; set; } = new();
     }
-}
+}

SabreTools.Data.Models/AACS/SubsetDifference.cs

@@ -20,4 +20,4 @@ namespace SabreTools.Data.Models.AACS
         /// </summary>
         public uint Number;
     }
-}
+}

SabreTools.Data.Models/AACS/SubsetDifferenceIndexRecord.cs

@@ -21,6 +21,6 @@ namespace SabreTools.Data.Models.AACS
         /// Subset-Difference record, with 0 being the start of the record.
         /// </summary>
         // <remarks>UInt24 not UInt32</remarks>
-        public uint[]? Offsets { get; set; }
+        public uint[] Offsets { get; set; } = [];
     }
-}
+}

SabreTools.Data.Models/AACS/TypeAndVersionRecord.cs

@@ -29,4 +29,4 @@ namespace SabreTools.Data.Models.AACS
         /// </summary>
         public uint VersionNumber { get; set; }
     }
-}
+}

SabreTools.Data.Models/AACS/VerifyMediaKeyRecord.cs

@@ -19,6 +19,7 @@ namespace SabreTools.Data.Models.AACS
         /// where 0xXXXXXXXXXXXXXXXX is an arbitrary 8-byte value, and Km is
         /// the correct final Media Key value.
         /// </summary>
-        public byte[]? CiphertextValue { get; set; }
+        /// <remarks>0x10 bytes</remarks>
+        public byte[] CiphertextValue { get; set; } = new byte[0x10];
     }
-}
+}

SabreTools.Data.Models/ASN1/ASN1Type.cs

@@ -1,5 +1,6 @@
 using System;
 
+#pragma warning disable CA1069 // Enums values should not be duplicated
 namespace SabreTools.Data.Models.ASN1
 {
     /// <summary>

SabreTools.Data.Models/AdvancedInstaller/Constants.cs

@@ -6,4 +6,4 @@ namespace SabreTools.Data.Models.AdvancedInstaller
 
         public const string SignatureString = "ADVINSTSFX";
     }
-}
+}

SabreTools.Data.Models/AdvancedInstaller/FileEntry.cs

@@ -56,6 +56,6 @@ namespace SabreTools.Data.Models.AdvancedInstaller
         /// <summary>
         /// Unicode-encoded file name
         /// </summary>
-        public string? Name { get; set; }
+        public string Name { get; set; } = string.Empty;
     }
 }

SabreTools.Data.Models/AdvancedInstaller/Footer.cs

@@ -32,7 +32,7 @@ namespace SabreTools.Data.Models.AdvancedInstaller
         /// </summary>
         /// <remarks>
         /// Only seen when the preceeding two fields exist
-        /// 
+        ///
         /// Observed values:
         /// - 01 00 00 00
         /// </remarks>
@@ -80,7 +80,7 @@ namespace SabreTools.Data.Models.AdvancedInstaller
         /// Hex string that looks like a key or other identifier
         /// </summary>
         /// <remarks>32 bytes</remarks>
-        public string? HexString { get; set; }
+        public string HexString { get; set; } = string.Empty;
 
         /// <summary>
         /// Unknown
@@ -89,7 +89,7 @@ namespace SabreTools.Data.Models.AdvancedInstaller
         /// Offset pointer to <see cref="FileDataStart"/>
         /// relative to the end of the signature if no filename
         /// exists.
-        /// 
+        ///
         /// Observed values:
         /// - 32 00 00 00 (No original filename)
         /// - 13 02 00 00 (Original filename)
@@ -99,7 +99,7 @@ namespace SabreTools.Data.Models.AdvancedInstaller
         /// <summary>
         /// "ADVINSTSFX"
         /// </summary>
-        public string? Signature { get; set; }
+        public string Signature { get; set; } = string.Empty;
 
         /// <summary>
         /// Unknown, always 0? Padding?

SabreTools.Data.Models/AdvancedInstaller/SFX.cs

@@ -5,12 +5,12 @@ namespace SabreTools.Data.Models.AdvancedInstaller
     /// Advanced Installer SFX file. These SFX files store
     /// all files uncompressed sequentially in the overlay
     /// of an executable.
-    /// 
+    ///
     /// The design is similar to the end of central directory
     /// in a PKZIP file. The footer needs to be read before
     /// the entry table as both the pointer to the start of
     /// the table as well as the entry count are included there.
-    /// 
+    ///
     /// The layout of this is derived from the layout in the
     /// physical file.
     /// </summary>
@@ -19,11 +19,11 @@ namespace SabreTools.Data.Models.AdvancedInstaller
         /// <summary>
         /// Set of file entries
         /// </summary>
-        public FileEntry[]? Entries { get; set; }
+        public FileEntry[] Entries { get; set; } = [];
 
         /// <summary>
         /// Footer representing the central directory
         /// </summary>
-        public Footer? Footer { get; set; }
+        public Footer Footer { get; set; } = new();
     }
 }

SabreTools.Data.Models/ArchiveDotOrg/File.cs

@@ -1,6 +1,7 @@
 using System.Xml;
 using System.Xml.Serialization;
 
+#pragma warning disable IDE1006 // Naming Styles
 namespace SabreTools.Data.Models.ArchiveDotOrg
 {
     [XmlRoot("file")]
@@ -32,7 +33,7 @@ namespace SabreTools.Data.Models.ArchiveDotOrg
         public string? SHA1 { get; set; }
 
         [XmlElement("filecount")]
-        public string? FileCount { get; set; }
+        public long? FileCount { get; set; }
 
         /// <remarks>Is this a set of defined values?</remarks>
         [XmlElement("format")]
@@ -202,4 +203,4 @@ namespace SabreTools.Data.Models.ArchiveDotOrg
 
         #endregion
     }
-}
+}

SabreTools.Data.Models/ArchiveDotOrg/Files.cs

@@ -9,4 +9,4 @@ namespace SabreTools.Data.Models.ArchiveDotOrg
         [XmlElement("file")]
         public File[]? File { get; set; }
     }
-}
+}

SabreTools.Data.Models/Atari7800/Cart.cs

@@ -0,0 +1,20 @@
+namespace SabreTools.Data.Models.Atari7800
+{
+    /// <summary>
+    /// Atari 7800 headered cart
+    /// </summary>
+    /// <see href="https://7800.8bitdev.org/index.php/A78_Header_Specification"/>
+    public class Cart
+    {
+        /// <summary>
+        /// A78 header
+        /// </summary>
+        /// <remarks>If omitted, format is technically BIN</remarks>
+        public Header? Header { get; set; }
+
+        /// <summary>
+        /// Cartridge data
+        /// </summary>
+        public byte[] Data { get; set; } = [];
+    }
+}

SabreTools.Data.Models/Atari7800/Constants.cs

@@ -0,0 +1,49 @@
+namespace SabreTools.Data.Models.Atari7800
+{
+    public static class Constants
+    {
+        /// <summary>
+        /// A78 magic string (null-padded)
+        /// </summary>
+        public static readonly byte[] MagicBytesWithNull =
+        [
+            0x41, 0x54, 0x41, 0x52, 0x49, 0x37, 0x38, 0x30,
+            0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        ];
+
+        /// <summary>
+        /// A78 magic string (null-padded)
+        /// </summary>
+        public const string MagicStringWithNull = "ATARI7800\0\0\0\0\0\0\0";
+
+        /// <summary>
+        /// A78 magic string (space-padded)
+        /// </summary>
+        public static readonly byte[] MagicBytesWithSpace =
+        [
+            0x41, 0x54, 0x41, 0x52, 0x49, 0x37, 0x38, 0x30,
+            0x30, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+        ];
+
+        /// <summary>
+        /// A78 magic string (space-padded)
+        /// </summary>
+        public const string MagicStringWithSpace = "ATARI7800       ";
+
+        /// <summary>
+        /// A78 header end magic text
+        /// </summary>
+        public static readonly byte[] HeaderEndMagicBytes =
+        [
+            0x41, 0x43, 0x54, 0x55, 0x41, 0x4C, 0x20, 0x43,
+            0x41, 0x52, 0x54, 0x20, 0x44, 0x41, 0x54, 0x41,
+            0x20, 0x53, 0x54, 0x41, 0x52, 0x54, 0x53, 0x20,
+            0x48, 0x45, 0x52, 0x45,
+        ];
+
+        /// <summary>
+        /// A78 header end magic text
+        /// </summary>
+        public const string HeaderEndMagicString = "ACTUAL CART DATA STARTS HERE";
+    }
+}

SabreTools.Data.Models/Atari7800/Enums.cs

@@ -0,0 +1,380 @@
+using System;
+
+namespace SabreTools.Data.Models.Atari7800
+{
+    /// <summary>
+    /// Audio device (v4+ only)
+    /// </summary>
+    /// <see href="https://7800.8bitdev.org/index.php/A78_Header_Specification"/>
+    [Flags]
+    public enum AudioDevice : ushort
+    {
+        #region POKEY location
+
+        /// <summary>
+        /// POKEY - none
+        /// </summary>
+        PokeyNone = 0b00000000,
+
+        /// <summary>
+        /// POKEY - @440
+        /// </summary>
+        Pokey440 = 0b00000001,
+
+        /// <summary>
+        /// POKEY - @450
+        /// </summary>
+        Pokey450 = 0b00000010,
+
+        /// <summary>
+        /// POKEY - @450+@440
+        /// </summary>
+        Pokey450Plus440 = 0b00000011,
+
+        /// <summary>
+        /// POKEY - @800
+        /// </summary>
+        Pokey800 = 0b00000100,
+
+        /// <summary>
+        /// POKEY - @4000
+        /// </summary>
+        Pokey4000 = 0b00000101,
+
+        #endregion
+
+        /// <summary>
+        /// YM2151 @460
+        /// </summary>
+        YM2151460 = 0b00001000,
+
+        /// <summary>
+        /// COVOX @430
+        /// </summary>
+        COVOX430 = 0b00010000,
+
+        /// <summary>
+        /// ADPCM Audio Stream @420
+        /// </summary>
+        ADPCMAudioStream420 = 0b00100000,
+    }
+
+    /// <summary>
+    /// Cart type specifications
+    /// </summary>
+    /// <see href="https://7800.8bitdev.org/index.php/A78_Header_Specification"/>
+    [Flags]
+    public enum CartType : ushort
+    {
+        /// <summary>
+        /// pokey at $4000
+        /// </summary>
+        PokeyAt4000 = 0b00000000_00000001,
+
+        /// <summary>
+        /// supergame bank switched
+        /// </summary>
+        SupergameBankSwitched = 0b00000000_00000010,
+
+        /// <summary>
+        /// supergame ram at $4000
+        /// </summary>
+        SupergameRamAt4000 = 0b00000000_00000100,
+
+        /// <summary>
+        /// rom at $4000
+        /// </summary>
+        RomAt4000 = 0b00000000_00001000,
+
+        /// <summary>
+        /// bank 6 at $4000
+        /// </summary>
+        Bank6At4000 = 0b00000000_00010000,
+
+        /// <summary>
+        /// banked ram
+        /// </summary>
+        BankedRam = 0b00000000_00100000,
+
+        /// <summary>
+        /// pokey at $450
+        /// </summary>
+        PokeyAt450 = 0b00000000_01000000,
+
+        /// <summary>
+        /// mirror ram at $4000
+        /// </summary>
+        MirrorRamAt4000 = 0b00000000_10000000,
+
+        /// <summary>
+        /// activision banking
+        /// </summary>
+        ActivisionBanking = 0b00000001_00000000,
+
+        /// <summary>
+        /// absolute banking
+        /// </summary>
+        AbsoluteBanking = 0b00000010_00000000,
+
+        /// <summary>
+        /// pokey at $440
+        /// </summary>
+        PokeyAt440 = 0b00000100_00000000,
+
+        /// <summary>
+        /// ym2151 at $460/$461
+        /// </summary>
+        Ym2151At460461 = 0b00001000_00000000,
+
+        /// <summary>
+        /// souper
+        /// </summary>
+        Souper = 0b00010000_00000000,
+
+        /// <summary>
+        /// banksets
+        /// </summary>
+        Banksets = 0b00100000_00000000,
+
+        /// <summary>
+        /// halt banked ram
+        /// </summary>
+        HaltBankedRam = 0b01000000_00000000,
+
+        /// <summary>
+        /// pokey@800
+        /// </summary>
+        PokeyAt800 = 0b10000000_00000000,
+    }
+
+    /// <summary>
+    /// Controller type
+    /// </summary>
+    /// <see href="https://7800.8bitdev.org/index.php/A78_Header_Specification"/>
+    public enum ControllerType : byte
+    {
+        /// <summary>
+        /// none
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// 7800 joystick
+        /// </summary>
+        Joystick = 1,
+
+        /// <summary>
+        /// lightgun
+        /// </summary>
+        Lightgun = 2,
+
+        /// <summary>
+        /// paddle
+        /// </summary>
+        Paddle = 3,
+
+        /// <summary>
+        /// trakball
+        /// </summary>
+        Trakball = 4,
+
+        /// <summary>
+        /// 2600 joystick
+        /// </summary>
+        VcsJoystick = 5,
+
+        /// <summary>
+        /// 2600 driving
+        /// </summary>
+        VcsDriving = 6,
+
+        /// <summary>
+        /// 2600 keypad
+        /// </summary>
+        VcsKeypad = 7,
+
+        /// <summary>
+        /// ST mouse
+        /// </summary>
+        STMouse = 8,
+
+        /// <summary>
+        /// Amiga mouse
+        /// </summary>
+        AmigaMouse = 9,
+
+        /// <summary>
+        /// AtariVox/SaveKey
+        /// </summary>
+        AtariVoxSaveKey = 10,
+
+        /// <summary>
+        /// SNES2Atari
+        /// </summary>
+        SNES2Atari = 11,
+
+        /// <summary>
+        /// Mega7800
+        /// </summary>
+        Mega7800 = 12,
+    }
+
+    /// <summary>
+    /// Interrupt (v4+ only)
+    /// </summary>
+    /// <see href="https://7800.8bitdev.org/index.php/A78_Header_Specification"/>
+    [Flags]
+    public enum Interrupt : ushort
+    {
+        None = 0b00000000,
+
+        /// <summary>
+        /// POKEY 1 (@450 | @800 | @4000)
+        /// </summary>
+        Pokey1 = 0b00000001,
+
+        /// <summary>
+        /// POKEY 2 (@440)
+        /// </summary>
+        Pokey2 = 0b00000010,
+
+        /// <summary>
+        /// YM2151
+        /// </summary>
+        YM2151 = 0b00000100,
+    }
+
+    /// <summary>
+    /// Mapper (v4+ only)
+    /// </summary>
+    /// <see href="https://7800.8bitdev.org/index.php/A78_Header_Specification"/>
+    public enum Mapper : byte
+    {
+        Linear = 0,
+        SuperGame = 1,
+        Activision = 2,
+        Absolute = 3,
+        Souper = 4,
+    }
+
+    /// <summary>
+    /// Mapper options/details (v4+ only)
+    /// </summary>
+    /// <see href="https://7800.8bitdev.org/index.php/A78_Header_Specification"/>
+    [Flags]
+    public enum MapperOptions : byte
+    {
+        #region Linear
+
+        /// <summary>
+        /// Option at @4000 - none
+        /// </summary>
+        LinearNone = 0b00000000,
+
+        /// <summary>
+        /// Option at @4000 - 16K RAM
+        /// </summary>
+        Linear16KRAM = 0b00000001,
+
+        /// <summary>
+        /// Option at @4000 - 8K EXRAM/A8
+        /// </summary>
+        Linear8KEXRAMA8 = 0b00000010,
+
+        /// <summary>
+        /// Option at @4000 - 32K EXRAM/M2
+        /// </summary>
+        Linear32KEXRAMM2 = 0b00000011,
+
+        #endregion
+
+        #region SuperGame
+
+        /// <summary>
+        /// Option at @4000 - none
+        /// </summary>
+        SuperGameNone = 0b00000000,
+
+        /// <summary>
+        /// Option at @4000 - 16K RAM
+        /// </summary>
+        SuperGame16KRAM = 0b00000001,
+
+        /// <summary>
+        /// Option at @4000 - 8K EXRAM/A8
+        /// </summary>
+        SuperGame8KEXRAMA8 = 0b00000010,
+
+        /// <summary>
+        /// Option at @4000 - 32K EXRAM/M2
+        /// </summary>
+        SuperGame32KEXRAMM2 = 0b00000011,
+
+        /// <summary>
+        /// Option at @4000 - EXROM
+        /// </summary>
+        SuperGameEXROM = 0b00000100,
+
+        /// <summary>
+        /// Option at @4000 - EXFIX
+        /// </summary>
+        SuperGameEXFIX = 0b00000101,
+
+        /// <summary>
+        /// Option at @4000 - 32k EXRAM/X2
+        /// </summary>
+        SuperGame32KEXRAMX2 = 0b00000110,
+
+        #endregion
+
+        /// <summary>
+        /// Bankset ROM
+        /// </summary>
+        BanksetRom = 0b10000000,
+    }
+
+    /// <summary>
+    /// Save device
+    /// </summary>
+    /// <see href="https://7800.8bitdev.org/index.php/A78_Header_Specification"/>
+    public enum SaveDevice : byte
+    {
+        None = 0b00000000,
+
+        /// <summary>
+        /// HSC
+        /// </summary>
+        HSC = 0b00000001,
+
+        /// <summary>
+        /// SaveKey/AtariVox
+        /// </summary>
+        SaveKeyAtariVox = 0b00000010,
+    }
+
+    /// <summary>
+    /// Slot passthrough device
+    /// </summary>
+    public enum SlotPassthroughDevice : byte
+    {
+        None = 0b00000000,
+        XM = 0b00000001,
+    }
+
+    /// <summary>
+    /// TV type
+    /// </summary>
+    /// <see href="https://7800.8bitdev.org/index.php/A78_Header_Specification"/>
+    [Flags]
+    public enum TVType : byte
+    {
+        NTSC = 0b00000000,
+        PAL = 0b00000001,
+
+        Component = 0b00000000,
+        Composite = 0b00000010,
+
+        SingleRegion = 0b00000000,
+        MultiRegion = 0b00000100,
+    }
+}

SabreTools.Data.Models/Atari7800/Header.cs

@@ -0,0 +1,115 @@
+namespace SabreTools.Data.Models.Atari7800
+{
+    /// <summary>
+    /// Atari 7800 emulator header
+    /// </summary>
+    /// <see href="https://7800.8bitdev.org/index.php/A78_Header_Specification"/>
+    public class Header
+    {
+        /// <summary>
+        /// Header version
+        /// </summary>
+        /// <remarks>
+        /// Current header version is 4.
+        /// If no V4 features are used, this should be set to 3.
+        /// </remarks>
+        public byte HeaderVersion { get; set; }
+
+        /// <summary>
+        /// "ATARI7800" with 7 null bytes following
+        /// </summary>
+        public byte[] MagicText { get; set; } = new byte[16];
+
+        /// <summary>
+        /// Cart title, encoding not specified
+        /// </summary>
+        public byte[] CartTitle { get; set; } = new byte[32];
+
+        /// <summary>
+        /// ROM size without header data
+        /// </summary>
+        /// <remarks>
+        /// Endianness possibly varies by version?
+        /// Version 1 - Big-endian
+        /// Version 2 - ?????
+        /// Version 3 - Documented as little-endian (unconfirmed)
+        /// Version 4 - Documented as little-endian (unconfirmed)
+        /// </remarks>
+        public uint RomSizeWithoutHeader { get; set; }
+
+        /// <summary>
+        /// Cart type flags
+        /// </summary>
+        public CartType CartType { get; set; }
+
+        /// <summary>
+        /// Controller 1 type
+        /// </summary>
+        public ControllerType Controller1Type { get; set; }
+
+        /// <summary>
+        /// Controller 2 type
+        /// </summary>
+        public ControllerType Controller2Type { get; set; }
+
+        /// <summary>
+        /// TV type
+        /// </summary>
+        public TVType TVType { get; set; }
+
+        /// <summary>
+        /// Save device
+        /// </summary>
+        public SaveDevice SaveDevice { get; set; }
+
+        /// <summary>
+        /// Reserved
+        /// </summary>
+        public byte[] Reserved { get; set; } = new byte[4];
+
+        /// <summary>
+        /// Slot passthrough device
+        /// </summary>
+        public SlotPassthroughDevice SlotPassthroughDevice { get; set; }
+
+        #region Version 4+
+
+        /// <summary>
+        /// Mapper
+        /// </summary>
+        /// <remarks>v4+ only</remarks>
+        public Mapper Mapper { get; set; }
+
+        /// <summary>
+        /// Mapper options
+        /// </summary>
+        /// <remarks>v4+ only</remarks>
+        public MapperOptions MapperOptions { get; set; }
+
+        /// <summary>
+        /// Audio device(s)
+        /// </summary>
+        public AudioDevice AudioDevice { get; set; }
+
+        /// <summary>
+        /// Interrupt
+        /// </summary>
+        public Interrupt Interrupt { get; set; }
+
+        #endregion
+
+        /// <summary>
+        /// Padding from end of header data to end magic text
+        /// </summary>
+        /// <remarks>
+        /// 36 bytes in versions lower than 4.
+        /// 30 bytes in versions 4 and above.
+        /// </remarks>
+        public byte[] Padding { get; set; } = [];
+
+        /// <summary>
+        /// "ACTUAL CART DATA STARTS HERE"
+        /// </summary>
+        public byte[] EndMagicText { get; set; } = new byte[28];
+    }
+}

SabreTools.Data.Models/AtariLynx/Cart.cs

@@ -0,0 +1,20 @@
+namespace SabreTools.Data.Models.AtariLynx
+{
+    /// <summary>
+    /// Atari Lynx headered cart (LNX)
+    /// </summary>
+    /// <see href="https://github.com/mozzwald/handy-sdl/blob/master/src/handy-0.95/cart.h"/>
+    public class Cart
+    {
+        /// <summary>
+        /// LNX header
+        /// </summary>
+        /// <remarks>If omitted, format is technically LYX</remarks>
+        public Header? Header { get; set; }
+
+        /// <summary>
+        /// Cartridge data
+        /// </summary>
+        public byte[] Data { get; set; } = [];
+    }
+}

SabreTools.Data.Models/AtariLynx/Constants.cs

@@ -0,0 +1,15 @@
+namespace SabreTools.Data.Models.AtariLynx
+{
+    public static class Constants
+    {
+        /// <summary>
+        /// LNX magic string
+        /// </summary>
+        public static readonly byte[] MagicBytes = [0x4C, 0x59, 0x4E, 0x58];
+
+        /// <summary>
+        /// LNX magic string
+        /// </summary>
+        public const string MagicString = "LYNX";
+    }
+}

SabreTools.Data.Models/AtariLynx/Enums.cs

@@ -0,0 +1,24 @@
+namespace SabreTools.Data.Models.AtariLynx
+{
+    /// <summary>
+    /// Screen rotation
+    /// </summary>
+    /// <see href="https://github.com/mozzwald/handy-sdl/blob/master/src/handy-0.95/cart.h"/>
+    public enum Rotation : byte
+    {
+        /// <summary>
+        /// No rotation (horizontal, buttons right)
+        /// </summary>
+        NoRotation = 0,
+
+        /// <summary>
+        /// Rotate left (vertical, buttons down)
+        /// </summary>
+        RotateLeft = 1,
+
+        /// <summary>
+        /// Rotate right (vertical, buttons up)
+        /// </summary>
+        RotateRight = 2,
+    }
+}

SabreTools.Data.Models/AtariLynx/Header.cs

@@ -0,0 +1,54 @@
+namespace SabreTools.Data.Models.AtariLynx
+{
+    /// <summary>
+    /// Atari Lynx emulator header
+    /// </summary>
+    /// <see href="https://github.com/mozzwald/handy-sdl/blob/master/src/handy-0.95/cart.h"/>
+    public class Header
+    {
+        /// <summary>
+        /// "LYNX"
+        /// </summary>
+        /// <remarks>4 bytes</remarks>
+        public byte[] Magic { get; set; } = new byte[4];
+
+        /// <summary>
+        /// Page size for bank 0
+        /// </summary>
+        public ushort Bank0PageSize { get; set; }
+
+        /// <summary>
+        /// Page size for bank 1
+        /// </summary>
+        public ushort Bank1PageSize { get; set; }
+
+        /// <summary>
+        /// Header version
+        /// </summary>
+        /// <remarks>Must be 0x0001</remarks>
+        public ushort Version { get; set; }
+
+        /// <summary>
+        /// Game title (Null-padded ASCII)
+        /// </summary>
+        /// <remarks>32 bytes</remarks>
+        public byte[] CartName { get; set; } = new byte[32];
+
+        /// <summary>
+        /// Publisher name
+        /// </summary>
+        /// <remarks>16 bytes</remarks>
+        public byte[] Manufacturer { get; set; } = new byte[16];
+
+        /// <summary>
+        /// Screen rotation
+        /// </summary>
+        public Rotation Rotation { get; set; }
+
+        /// <summary>
+        /// Padding
+        /// </summary>
+        /// <remarks>5 bytes</remarks>
+        public byte[] Spare { get; set; } = new byte[5];
+    }
+}

SabreTools.Data.Models/AttractMode/MetadataFile.cs

@@ -1,5 +1,3 @@
-using SabreTools.Data.Attributes;
-
 namespace SabreTools.Data.Models.AttractMode
 {
     /// <summary>
@@ -12,4 +10,4 @@ namespace SabreTools.Data.Models.AttractMode
 
         public Row[]? Row { get; set; }
     }
-}
+}

SabreTools.Data.Models/AttractMode/Row.cs

@@ -1,5 +1,3 @@
-using SabreTools.Data.Attributes;
-
 namespace SabreTools.Data.Models.AttractMode
 {
     public class Row
@@ -48,6 +46,6 @@ namespace SabreTools.Data.Models.AttractMode
 
         public string? PlayedTime { get; set; }
 
-        public string? FileIsAvailable { get; set; }
+        public bool? FileIsAvailable { get; set; }
     }
-}
+}

SabreTools.Data.Models/BDPlus/Constants.cs

@@ -6,4 +6,4 @@ namespace SabreTools.Data.Models.BDPlus
 
         public const string SignatureString = "BDSVM_CC";
     }
-}
+}

SabreTools.Data.Models/BDPlus/SVM.cs

@@ -9,13 +9,13 @@ namespace SabreTools.Data.Models.BDPlus
         /// "BDSVM_CC"
         /// </summary>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8)]
-        public string? Signature;
+        public string Signature = string.Empty;
 
         /// <summary>
         /// Unknown data
         /// </summary>
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-        public byte[]? Unknown1 = new byte[5];
+        public byte[] Unknown1 = new byte[5];
 
         /// <summary>
         /// Version year
@@ -43,8 +43,8 @@ namespace SabreTools.Data.Models.BDPlus
         public uint Length;
 
         /// <summary>
-        /// Length bytes of data
+        /// <see cref="Length"> bytes of data
         /// </summary>
-        public byte[]? Data { get; set; }
+        public byte[] Data { get; set; } = [];
     }
-}
+}

SabreTools.Data.Models/BFPK/Archive.cs

@@ -9,11 +9,11 @@
         /// <summary>
         /// Header
         /// </summary>
-        public Header? Header { get; set; }
+        public Header Header { get; set; } = new();
 
         /// <summary>
         /// Files
         /// </summary>
-        public FileEntry[]? Files { get; set; }
+        public FileEntry[] Files { get; set; } = [];
     }
 }

SabreTools.Data.Models/BFPK/Constants.cs

@@ -8,4 +8,4 @@ namespace SabreTools.Data.Models.BFPK
 
         public const uint SignatureUInt32 = 0x4b504642;
     }
-}
+}

SabreTools.Data.Models/BFPK/FileEntry.cs

@@ -14,7 +14,7 @@
         /// <summary>
         /// Name
         /// </summary>
-        public string? Name { get; set; }
+        public string Name { get; set; } = string.Empty;
 
         /// <summary>
         /// Uncompressed size

SabreTools.Data.Models/BFPK/Header.cs

@@ -13,7 +13,7 @@ namespace SabreTools.Data.Models.BFPK
         /// "BFPK"
         /// </summary>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 4)]
-        public string? Magic;
+        public string Magic = string.Empty;
 
         /// <summary>
         /// Version

SabreTools.Data.Models/BSP/AmbientIndexLump.cs

@@ -6,6 +6,6 @@ namespace SabreTools.Data.Models.BSP
         /// <summary>
         /// Indicies
         /// </summary>
-        public LeafAmbientIndex[]? Indicies { get; set; }
+        public LeafAmbientIndex[] Indicies { get; set; } = [];
     }
-}
+}

SabreTools.Data.Models/BSP/AmbientLightingLump.cs

@@ -6,6 +6,6 @@ namespace SabreTools.Data.Models.BSP
         /// <summary>
         /// Lightings
         /// </summary>
-        public LeafAmbientLighting[]? Lightings { get; set; }
+        public LeafAmbientLighting[] Lightings { get; set; } = [];
     }
-}
+}

SabreTools.Data.Models/BSP/Brush.cs

@@ -30,4 +30,4 @@ namespace SabreTools.Data.Models.BSP
         /// </summary>
         public VbspContents Contents;
     }
-}
+}