Bump version

Sync changes from downstream
Make this more clear
2026-02-08 05:44:30 +00:00 · 2025-09-01 15:05:53 -04:00 · 2025-09-01 15:05:15 -04:00 · 2025-08-28 23:37:18 -04:00 · 2025-08-28 21:29:23 -04:00 · 2025-08-28 21:18:39 -04:00
262 changed files with 6592 additions and 1073 deletions
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -1,4 +1,4 @@
-name: Nuget Pack
+name: Build and Test

 on:
  push:
@@ -16,25 +16,22 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v4
      with:
-        dotnet-version: 9.0.x
+        dotnet-version: |
+            6.0.x
+            8.0.x
+            9.0.x
        
-    - name: Restore dependencies
-      run: dotnet restore
-      
-    - name: Pack
-      run: dotnet pack
+    - name: Run tests
+      run: dotnet test

-    - name: Upload build
-      uses: actions/upload-artifact@v4
-      with:
-        name: 'Nuget Package'
-        path: 'SabreTools.Models/bin/Release/*.nupkg'
+    - name: Run publish script
+      run: ./publish-nix.sh

    - name: Upload to rolling
      uses: ncipollo/release-action@v1.14.0
      with:
        allowUpdates: True
-        artifacts: 'SabreTools.Models/bin/Release/*.nupkg'
+        artifacts: "*.nupkg,*.snupkg"
        body: 'Last built commit: ${{ github.sha }}'
        name: 'Rolling Release'
        prerelease: True
--- a/.github/workflows/check_pr.yml
+++ b/.github/workflows/check_pr.yml
@@ -11,7 +11,13 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v4
      with:
-        dotnet-version: 9.0.x
+        dotnet-version: |
+            6.0.x
+            8.0.x
+            9.0.x
      
    - name: Build
-      run: dotnet build
+      run: dotnet build
+
+    - name: Run tests
+      run: dotnet test
--- a/README.MD
+++ b/README.MD
@@ -1,13 +1,63 @@
 # SabreTools.Models

+[![Build and Test](https://github.com/SabreTools/SabreTools.Models/actions/workflows/build_and_test.yml/badge.svg?branch=main)](https://github.com/SabreTools/SabreTools.Models/actions/workflows/build_and_test.yml)
+
 This library comprises of models that represent either directly serializable or representative structures for all SabreTools projects. All of the main models representing metadata files should have parsers created outside of the current code.

 Find the link to the Nuget package [here](https://www.nuget.org/packages/SabreTools.Models).

-## Missing Metadata Models
+## Releases

-The following metadata file formats do not have models included in this library yet and, as such, do not have serializers:
+For the most recent stable build, download the latest release here: [Releases Page](https://github.com/SabreTools/SabreTools.Models/releases)

- Missfile
- SabreJSON
- SabreDAT XML
+For the latest WIP build here: [Rolling Release](https://github.com/SabreTools/SabreTools.Models/releases/rolling)
+
+## Notable Information Sources
+
+Not all of this information was able to be gathered directly from the files in question, so here is a non-exhaustive list of sites and projects that allow this project to exist. Most of the models also have direct links to specific pages or code snippets, where available.
+
+| Site/Project | Models Directory |
+| --- | --- |
+| [3DBrew](https://www.3dbrew.org/wiki/Main_Page) | N3DS |
+| [Aaru Data Preservation Suite](https://github.com/aaru-dps) | PIC |
+| [Advanced Access Content System Licensing Administrator (AACS LA)](https://aacsla.com/) | AACS |
+| [BYTE*](https://web.archive.org/web/20240703222951/https://bytepointer.com/index.htm) | NewExecutable |
+| [cabextract/libmspack](https://www.cabextract.org.uk/) | LZ |
+| [DBox](https://dbox.tools/) | Xbox |
+| [DebugInfo.com](https://www.debuginfo.com/index.html) | PortableExecutable |
+| [Devilsclaw](https://devilsclaws.net/) | PFF |
+| [DSiBrew](https://dsibrew.org/wiki/Main_Page) | Nitro |
+| [DVD Resources for Open Source Development](https://dvd.sourceforge.net/) | DVD |
+| [EDM/2](https://www.edm2.com/index.php/Main_Page) | LinearExecutable |
+| [faydoc.tripod.com](https://faydoc.tripod.com/formats/) | LinearExecutable |
+| [GuitarGame_ChartFormats](https://github.com/TheNathannator/GuitarGame_ChartFormats/) | Charts |
+| [HandWiki](https://handwiki.org/wiki/Start) | Quantum |
+| [HLLib](https://github.com/RavuAlHemio/hllib/) | BSP, GCF, NCF, PAK, SGA, VPK, WAD3, XZP |
+| [IBM Documentation](https://www.ibm.com/docs/en) | TAR |
+| [IETF](https://www.ietf.org/) | GZIP |
+| [Independent Commodore Library](https://petlibrary.tripod.com/) | PKZIP |
+| [Ladislav Zezula](http://zezula.net/en/tools/main.html) | MoPaQ |
+| [libbdplus](https://github.com/mwgoldsmith/bdplus) | BD+ |
+| [libexe](https://github.com/libyal/libexe/) | NewExecutable |
+| [MAME](https://github.com/mamedev/mame/) | CHD |
+| [Matthew Russotto](http://www.russotto.net/quantumcomp.html) | Compression/Quantum |
+| [Microsoft Learn](https://learn.microsoft.com/en-us/) | BMP, CFB, Compression/LZX, Compression/MSZIP, MicrosoftCabinet, OLE, PortableExecutable, SecuROM, WiseInstaller |
+| [msitools](https://github.com/GNOME/msitools/) | CFB |
+| [OSDev.org](https://wiki.osdev.org/Expanded_Main_Page) | MSDOS, NewExecutable |
+| [PInvoke.net](http://www.pinvoke.net/index.aspx) | MSDOS |
+| [PKWARE(?)](https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT) | PKZIP |
+| [PS3 Developer Wiki](https://www.psdevwiki.com/ps3/) | IRD, PlayStation3 |
+| [RanseiLink](https://github.com/Deijin27/RanseiLink) | Nitro |
+| [Reverse Engineering Wise](https://codeberg.org/CYBERDEV/REWise) | WiseInstaller |
+| [SharpCompress](https://github.com/adamhathcock/sharpcompress) | PKZIP |
+| [Source SDK 2013](https://github.com/ValveSoftware/source-sdk-2013) | BSP |
+| [Technical Committee T10](https://www.t10.org/) | PIC |
+| [The Go tools for Windows + Assembler](https://www.godevtool.com/) | PortableExecutable |
+| [The Whole Half-Life](https://twhl.info/wiki/page/Specification:_WAD3) | WAD3 |
+| [Unshield](https://github.com/twogood/unshield) | InstallShieldCabinet |
+| [unshieldv3](https://github.com/wfr/unshieldv3) | InstallShieldArchiveV3 |
+| [Valve Developer Community](https://developer.valvesoftware.com/wiki/Main_Page) | BSP, VPK |
+| [w4kfu's bl0g](https://web.archive.org/web/20250206143756/http://blog.w4kfu.com/) | SafeDisc |
+| [Wine](https://github.com/wine-mirror/wine/) | LZ |
+| [XboxDevWiki.net](https://xboxdevwiki.net/Main_Page) | Xbox |
+| [XeNTaX Game Research Forum](http://web.archive.org/web/20231031162306/https://forum.xentax.com/) | SFFS |
--- a/SabreTools.Models/BZip2/Archive.cs
+++ b/SabreTools.Models/BZip2/Archive.cs
@@ -0,0 +1,10 @@
+namespace SabreTools.Models.BZip2
+{
+    /// <summary>
+    /// This is a placeholder model for future work
+    /// </summary>
+    public class Archive
+    {
+
+    }
+}
--- a/SabreTools.Models/CFB/DirectoryEntry.cs
+++ b/SabreTools.Models/CFB/DirectoryEntry.cs
@@ -22,18 +22,18 @@ namespace SabreTools.Models.CFB
        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
        public string? Name;

-        /// <summary>
-        /// This field MUST be 0x00, 0x01, 0x02, or 0x05, depending on the
-        /// actual type of object. All other values are not valid.
-        /// </summary>
-        public ushort NameLength;
-
        /// <summary>
        /// This field MUST match the length of the Directory Entry Name Unicode
        /// string in bytes. The length MUST be a multiple of 2 and include the
        /// terminating null character in the count. This length MUST NOT exceed 64,
        /// the maximum size of the Directory Entry Name field.
        /// </summary>
+        public ushort NameLength;
+
+        /// <summary>
+        /// This field MUST be 0x00, 0x01, 0x02, or 0x05, depending on the
+        /// actual type of object. All other values are not valid.
+        /// </summary>
        [MarshalAs(UnmanagedType.U1)]
        public ObjectType ObjectType;

--- a/SabreTools.Models/Compression/Deflate/BlockHeader.cs
+++ b/SabreTools.Models/Compression/Deflate/BlockHeader.cs
@@ -1,18 +0,0 @@
-namespace SabreTools.Models.Compression.Deflate
-{
-    /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public class BlockHeader
-    {
-        /// <summary>
-        /// Set if and only if this is the last block of the data set.
-        /// </summary>
-        /// <remarks>Bit 0</remarks>
-        public bool BFINAL { get; set; }
-
-        /// <summary>
-        /// Specifies how the data are compressed
-        /// </summary>
-        /// <remarks>Bits 1-2</remarks>
-        public CompressionType BTYPE { get; set; }
-    }
-}
--- a/SabreTools.Models/Compression/Deflate/CompressedDataHeader.cs
+++ b/SabreTools.Models/Compression/Deflate/CompressedDataHeader.cs
@@ -1,20 +0,0 @@
-namespace SabreTools.Models.Compression.Deflate
-{
-    /// <summary>
-    /// Compression with Huffman codes (BTYPE=01 or BTYPE=02)
-    /// </summary>
-    /// <see href="https://interoperability.blob.core.windows.net/files/MS-MCI/%5bMS-MCI%5d.pdf"/>
-    /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public abstract class CompressedDataHeader : DataHeader
-    {
-        /// <summary>
-        /// Huffman code lengths for the literal / length alphabet
-        /// </summary>
-        public virtual uint[]? LiteralLengths { get; set; }
-
-        /// <summary>
-        /// Huffman distance codes for the literal / length alphabet
-        /// </summary>
-        public virtual uint[]? DistanceCodes { get; set; }
-    }
-}
--- a/SabreTools.Models/Compression/Deflate/Constants.cs
+++ b/SabreTools.Models/Compression/Deflate/Constants.cs
@@ -1,136 +0,0 @@
-namespace SabreTools.Models.Compression.Deflate
-{
-    /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public static class Constants
-    {
-        /// <summary>
-        /// Bits in base literal/length lookup table
-        /// </summary>
-        public const int ZIPLBITS = 9;
-
-        /// <summary>
-        /// Bits in base distance lookup table
-        /// </summary>
-        public const int ZIPDBITS = 6;
-
-        /// <summary>
-        /// Maximum bit length of any code
-        /// </summary>
-        public const int ZIPBMAX = 16;
-
-        /// <summary>
-        /// Maximum number of codes in any set
-        /// </summary>
-        public const int ZIPN_MAX = 288;
-
-        #region Fixed Huffman Codes
-
-        /// <summary>
-        /// Fixed Huffman code lengths for the literal / length alphabet
-        /// </summary>
-        public static readonly uint[] FixedLiteralLengths =
-        [
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-            9, 9, 9, 9, 9, 9, 9, 9,
-            9, 9, 9, 9, 9, 9, 9, 9,
-            9, 9, 9, 9, 9, 9, 9, 9,
-            9, 9, 9, 9, 9, 9, 9, 9,
-            9, 9, 9, 9, 9, 9, 9, 9,
-            9, 9, 9, 9, 9, 9, 9, 9,
-            9, 9, 9, 9, 9, 9, 9, 9,
-            9, 9, 9, 9, 9, 9, 9, 9,
-            9, 9, 9, 9, 9, 9, 9, 9,
-            9, 9, 9, 9, 9, 9, 9, 9,
-            9, 9, 9, 9, 9, 9, 9, 9,
-            9, 9, 9, 9, 9, 9, 9, 9,
-            9, 9, 9, 9, 9, 9, 9, 9,
-            9, 9, 9, 9, 9, 9, 9, 9,
-            7, 7, 7, 7, 7, 7, 7, 7,
-            7, 7, 7, 7, 7, 7, 7, 7,
-            7, 7, 7, 7, 7, 7, 7, 7,
-            8, 8, 8, 8, 8, 8, 8, 8,
-        ];
-
-        /// <summary>
-        /// Fixed Huffman distance codes for the literal / length alphabet
-        /// </summary>
-        public static readonly uint[] FixedDistanceCodes =
-        [
-            5, 5, 5, 5, 5, 5, 5, 5,
-            5, 5, 5, 5, 5, 5, 5, 5,
-            5, 5, 5, 5, 5, 5, 5, 5,
-            5, 5, 5, 5, 5, 5,
-        ];
-
-        #endregion
-
-        #region Literal and Length Alphabets
-
-        /// <summary>
-        /// Extra bits for distance codes
-        /// </summary>
-        public static readonly ushort[] DistanceExtraBits =
-        [
-            0, 0, 0, 0, 1, 1, 2, 2, 3, 3,
-            4, 4, 5, 5, 6, 6, 7, 7, 8, 8,
-            9, 9, 10, 10, 11, 11, 12, 12, 13, 13
-        ];
-
-        /// <summary>
-        /// Copy offsets for distance codes 0..29
-        /// </summary>
-        public static readonly ushort[] DistanceOffsets =
-        [
-            1, 2, 3, 4, 5, 7, 9, 13, 17, 25,
-            33, 49, 65, 97, 129, 193, 257, 385, 513, 769,
-            1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577
-        ];
-
-        /// <summary>
-        /// Extra bits for literal codes 257..285
-        /// </summary>
-        public static readonly ushort[] LiteralExtraBits =
-        [
-            0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
-            1, 1, 2, 2, 2, 2, 3, 3, 3, 3,
-            4, 4, 4, 4, 5, 5, 5, 5, 0,
-        ];
-
-        /// <summary>
-        /// Copy lengths for literal codes 257..285
-        /// </summary>
-        public static readonly ushort[] LiteralLengths =
-        [
-            3, 4, 5, 6, 7, 8, 9, 10, 11, 13,
-            15, 17, 19, 23, 27, 31, 35, 43, 51, 59,
-            67, 83, 99, 115, 131, 163, 195, 227, 258,
-        ];
-
-        /// <summary>
-        /// Order of the bit length code lengths
-        /// </summary>
-        public static readonly byte[] BitLengthOrder =
-        [
-            16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
-        ];
-
-        #endregion
-    }
-}
--- a/SabreTools.Models/Compression/Deflate/DataHeader.cs
+++ b/SabreTools.Models/Compression/Deflate/DataHeader.cs
@@ -1,11 +0,0 @@
-namespace SabreTools.Models.Compression.Deflate
-{
-    /// <summary>
-    /// Base class for all data headers (BTYPE=00, BTYPE=01, or BTYPE=02)
-    /// </summary>
-    /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public abstract class DataHeader
-    {
-        // No common fields between all data headers
-    }
-}
--- a/SabreTools.Models/Compression/Deflate/DynamicCompressedDataHeader.cs
+++ b/SabreTools.Models/Compression/Deflate/DynamicCompressedDataHeader.cs
@@ -1,11 +0,0 @@
-namespace SabreTools.Models.Compression.Deflate
-{
-    /// <summary>
-    /// Compression with dynamic Huffman codes (BTYPE=10)
-    /// </summary>
-    /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public class DynamicCompressedDataHeader : CompressedDataHeader
-    {
-        // Codes are provided externally
-    }
-}
--- a/SabreTools.Models/Compression/Deflate/Enums.cs
+++ b/SabreTools.Models/Compression/Deflate/Enums.cs
@@ -1,26 +0,0 @@
-namespace SabreTools.Models.Compression.Deflate
-{
-    /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public enum CompressionType : byte
-    {
-        /// <summary>
-        /// no compression
-        /// </summary>
-        NoCompression = 0b00,
-
-        /// <summary>
-        /// Compressed with fixed Huffman codes
-        /// </summary>
-        FixedHuffman = 0b01,
-
-        /// <summary>
-        /// Compressed with dynamic Huffman codes
-        /// </summary>
-        DynamicHuffman = 0b10,
-
-        /// <summary>
-        /// Reserved (error)
-        /// </summary>
-        Reserved = 0b11,
-    }
-}
--- a/SabreTools.Models/Compression/Deflate/FixedCompressedDataHeader.cs
+++ b/SabreTools.Models/Compression/Deflate/FixedCompressedDataHeader.cs
@@ -1,24 +0,0 @@
-namespace SabreTools.Models.Compression.Deflate
-{
-    /// <summary>
-    /// Compression with fixed Huffman codes (BTYPE=01)
-    /// </summary>
-    /// <see href="https://interoperability.blob.core.windows.net/files/MS-MCI/%5bMS-MCI%5d.pdf"/>
-    /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public class FixedCompressedDataHeader : CompressedDataHeader
-    {
-        #region Properties
-
-        /// <summary>
-        /// Huffman code lengths for the literal / length alphabet
-        /// </summary>
-        public override uint[]? LiteralLengths => Constants.FixedLiteralLengths;
-
-        /// <summary>
-        /// Huffman distance codes for the literal / length alphabet
-        /// </summary>
-        public override uint[]? DistanceCodes => Constants.FixedDistanceCodes;
-
-        #endregion
-    }
-}
--- a/SabreTools.Models/Compression/Deflate/NonCompressedDataHeader.cs
+++ b/SabreTools.Models/Compression/Deflate/NonCompressedDataHeader.cs
@@ -1,21 +0,0 @@
-namespace SabreTools.Models.Compression.Deflate
-{
-    /// <summary>
-    /// Non-compressed blocks (BTYPE=00)
-    /// </summary>
-    /// <see href="https://www.rfc-editor.org/rfc/rfc1951"/>
-    public class NonCompressedBlockHeader : DataHeader
-    {
-        /// <summary>
-        /// The number of data bytes in the block
-        /// </summary>
-        /// <remarks>Bytes 0-1</remarks>
-        public ushort LEN { get; set; }
-
-        /// <summary>
-        /// The one's complement of LEN
-        /// </summary>
-        /// <remarks>Bytes 2-3</remarks>
-        public ushort NLEN { get; set; }
-    }
-}
--- a/SabreTools.Models/Compression/LZ/Constants.cs
+++ b/SabreTools.Models/Compression/LZ/Constants.cs
@@ -1,23 +0,0 @@
-namespace SabreTools.Models.Compression.LZ
-{
-    public static class Constants
-    {
-        public const int GETLEN	= 2048;
-
-        public const int LZ_MAGIC_LEN = 8;
-
-        public const int LZ_HEADER_LEN = 14;
-
-        public static readonly byte[] MagicBytes = [0x53, 0x5a, 0x44, 0x44, 0x88, 0xf0, 0x27, 0x33];
-
-        public static readonly string MagicString = System.Text.Encoding.ASCII.GetString(MagicBytes);
-
-        public const ulong MagicUInt64 = 0x3327f08844445a53;
-
-        public const int LZ_TABLE_SIZE = 0x1000;
-
-        public const int MAX_LZSTATES = 16;
-
-        public const int LZ_MIN_HANDLE = 0x400;
-    }
-}
--- a/SabreTools.Models/Compression/LZ/Enums.cs
+++ b/SabreTools.Models/Compression/LZ/Enums.cs
@@ -1,17 +0,0 @@
-namespace SabreTools.Models.Compression.LZ
-{
-    /// <see href="https://github.com/wine-mirror/wine/blob/master/include/lzexpand.h"/>
-    public enum LZERROR
-    {
-        LZERROR_OK = 1,
-        LZERROR_NOT_LZ = 0,
-        LZERROR_BADINHANDLE = -1,
-        LZERROR_BADOUTHANDLE = -2,
-        LZERROR_READ = -3,
-        LZERROR_WRITE = -4,
-        LZERROR_GLOBALLOC = -5,
-        LZERROR_GLOBLOCK = -6,
-        LZERROR_BADVALUE = -7,
-        LZERROR_UNKNOWNALG = -8,
-    }
-}
--- a/SabreTools.Models/Compression/LZ/FileHeader.cs
+++ b/SabreTools.Models/Compression/LZ/FileHeader.cs
@@ -1,22 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace SabreTools.Models.Compression.LZ
-{
-    /// <summary>
-    /// Format of first 14 byte of LZ compressed file
-    /// </summary>
-    /// <see href="https://github.com/wine-mirror/wine/blob/master/dlls/kernel32/lzexpand.c"/>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    public sealed class FileHeaader
-    {
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8)]
-        public string? Magic;
-
-        public byte CompressionType;
-
-        [MarshalAs(UnmanagedType.U1)]
-        public char LastChar;
-
-        public uint RealLength;
-    }
-}
--- a/SabreTools.Models/Compression/LZ/State.cs
+++ b/SabreTools.Models/Compression/LZ/State.cs
@@ -1,72 +0,0 @@
-using System.IO;
-
-namespace SabreTools.Models.Compression.LZ
-{
-    public sealed class State
-    {
-        /// <summary>
-        /// Internal backing stream
-        /// </summary>
-        public Stream? Source { get; set; }
-
-        /// <summary>
-        /// The last char of the filename for replacement
-        /// </summary>
-        public char LastChar { get; set; }
-
-        /// <summary>
-        /// Decompressed length of the file
-        /// </summary>
-        public uint RealLength { get; set; }
-
-        /// <summary>
-        /// Position the decompressor currently is
-        /// </summary>
-        public uint RealCurrent { get; set; }
-
-        /// <summary>
-        /// Position the user wants to read from
-        /// </summary>
-        public uint RealWanted { get; set; }
-
-        /// <summary>
-        /// The rotating LZ table
-        /// </summary>
-        public byte[]? Table { get; set; }
-
-        /// <summary>
-        /// CURrent TABle ENTry
-        /// </summary>
-        public uint CurrentTableEntry { get; set; }
-
-        /// <summary>
-        /// Length and position of current string
-        /// </summary>
-        public byte StringLength { get; set; }
-
-        /// <summary>
-        /// From stringtable
-        /// </summary>
-        public uint StringPosition { get; set; }
-
-        /// <summary>
-        /// Bitmask within blocks
-        /// </summary>
-        public ushort ByteType { get; set; }
-
-        /// <summary>
-        /// GETLEN bytes
-        /// </summary>
-        public byte[]? Window { get; set; }
-
-        /// <summary>
-        /// Current read
-        /// </summary>
-        public uint WindowCurrent { get; set; }
-
-        /// <summary>
-        /// Length last got
-        /// </summary>
-        public uint WindowLength { get; set; }
-    }
-}
--- a/SabreTools.Models/Compression/MSZIP/Block.cs
+++ b/SabreTools.Models/Compression/MSZIP/Block.cs
@@ -1,33 +0,0 @@
-namespace SabreTools.Models.Compression.MSZIP
-{
-    /// <summary>
-    /// Each MSZIP block MUST consist of a 2-byte MSZIP signature and one or more RFC 1951 blocks. The
-    /// 2-byte MSZIP signature MUST consist of the bytes 0x43 and 0x4B. The MSZIP signature MUST be
-    /// the first 2 bytes in the MSZIP block. The MSZIP signature is shown in the following packet diagram.
-    /// 
-    /// Each MSZIP block is the result of a single deflate compression operation, as defined in [RFC1951].
-    /// The compressor that performs the compression operation MUST generate one or more RFC 1951
-    /// blocks, as defined in [RFC1951]. The number, deflation mode, and type of RFC 1951 blocks in each
-    /// MSZIP block is determined by the compressor, as defined in [RFC1951]. The last RFC 1951 block in
-    /// each MSZIP block MUST be marked as the "end" of the stream(1), as defined by [RFC1951]
-    /// section 3.2.3. Decoding trees MUST be discarded after each RFC 1951 block, but the history buffer
-    /// MUST be maintained.Each MSZIP block MUST represent no more than 32 KB of uncompressed data.
-    /// 
-    /// The maximum compressed size of each MSZIP block is 32 KB + 12 bytes. This enables the MSZIP
-    /// block to contain 32 KB of data split between two noncompressed RFC 1951 blocks, each of which
-    /// has a value of BTYPE = 00.
-    /// </summary>
-    /// <see href="https://interoperability.blob.core.windows.net/files/MS-MCI/%5bMS-MCI%5d.pdf"/>
-    public class Block
-    {
-        /// <summary>
-        /// Block header
-        /// </summary>
-        public BlockHeader? BlockHeader { get; set; }
-
-        /// <summary>
-        /// Compressed blocks
-        /// </summary>
-        public DeflateBlock[]? CompressedBlocks { get; set; }
-    }
-}
--- a/SabreTools.Models/Compression/MSZIP/BlockHeader.cs
+++ b/SabreTools.Models/Compression/MSZIP/BlockHeader.cs
@@ -4,6 +4,18 @@ namespace SabreTools.Models.Compression.MSZIP
    /// Each MSZIP block MUST consist of a 2-byte MSZIP signature and one or more RFC 1951 blocks. The
    /// 2-byte MSZIP signature MUST consist of the bytes 0x43 and 0x4B. The MSZIP signature MUST be
    /// the first 2 bytes in the MSZIP block. The MSZIP signature is shown in the following packet diagram.
+    /// 
+    /// Each MSZIP block is the result of a single deflate compression operation, as defined in [RFC1951].
+    /// The compressor that performs the compression operation MUST generate one or more RFC 1951
+    /// blocks, as defined in [RFC1951]. The number, deflation mode, and type of RFC 1951 blocks in each
+    /// MSZIP block is determined by the compressor, as defined in [RFC1951]. The last RFC 1951 block in
+    /// each MSZIP block MUST be marked as the "end" of the stream(1), as defined by [RFC1951]
+    /// section 3.2.3. Decoding trees MUST be discarded after each RFC 1951 block, but the history buffer
+    /// MUST be maintained.Each MSZIP block MUST represent no more than 32 KB of uncompressed data.
+    /// 
+    /// The maximum compressed size of each MSZIP block is 32 KB + 12 bytes. This enables the MSZIP
+    /// block to contain 32 KB of data split between two noncompressed RFC 1951 blocks, each of which
+    /// has a value of BTYPE = 00.
    /// </summary>
    /// <see href="https://interoperability.blob.core.windows.net/files/MS-MCI/%5bMS-MCI%5d.pdf"/>
    public class BlockHeader
--- a/SabreTools.Models/Compression/MSZIP/Constants.cs
+++ b/SabreTools.Models/Compression/MSZIP/Constants.cs
@@ -1,20 +0,0 @@
-namespace SabreTools.Models.Compression.MSZIP
-{
-    /// <see href="https://github.com/wine-mirror/wine/blob/master/dlls/cabinet/cabinet.h"/>
-    public static class Constants
-    {
-        /// <summary>
-        /// Window size
-        /// </summary>
-        public const ushort ZIPWSIZE = 0x8000;
-
-        /// <summary>
-        /// And'ing with Zipmask[n] masks the lower n bits
-        /// </summary>
-        public static readonly ushort[] BitMasks =
-        [
-            0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
-            0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
-        ];
-    }
-}
--- a/SabreTools.Models/Compression/MSZIP/DeflateBlock.cs
+++ b/SabreTools.Models/Compression/MSZIP/DeflateBlock.cs
@@ -1,35 +0,0 @@
-namespace SabreTools.Models.Compression.MSZIP
-{
-    /// <summary>
-    /// Each MSZIP block is the result of a single deflate compression operation, as defined in [RFC1951].
-    /// The compressor that performs the compression operation MUST generate one or more RFC 1951
-    /// blocks, as defined in [RFC1951]. The number, deflation mode, and type of RFC 1951 blocks in each
-    /// MSZIP block is determined by the compressor, as defined in [RFC1951]. The last RFC 1951 block in
-    /// each MSZIP block MUST be marked as the "end" of the stream(1), as defined by [RFC1951]
-    /// section 3.2.3. Decoding trees MUST be discarded after each RFC 1951 block, but the history buffer
-    /// MUST be maintained.Each MSZIP block MUST represent no more than 32 KB of uncompressed data.
-    /// </summary>
-    /// <see href="https://interoperability.blob.core.windows.net/files/MS-MCI/%5bMS-MCI%5d.pdf"/>
-    public class DeflateBlock
-    {
-        /// <summary>
-        /// Deflate block (RFC-1951) header
-        /// </summary>
-        public Deflate.BlockHeader? Header { get; set; }
-
-        /// <summary>
-        /// Compression-specific data header
-        /// </summary>
-        public Deflate.DataHeader? DataHeader { get; set; }
-
-        /// <summary>
-        /// MSZIP data
-        /// </summary>
-        /// <remarks>
-        /// Depending on the implementation of these models, this property could either be
-        /// compressed or uncompressed data. Keep this in mind when using the built
-        /// versions of this model.
-        /// </remarks>
-        public byte[]? Data { get; set; }
-    }
-}
--- a/SabreTools.Models/Compression/Quantum/Constants.cs
+++ b/SabreTools.Models/Compression/Quantum/Constants.cs
@@ -1,6 +1,6 @@
 namespace SabreTools.Models.Compression.Quantum
 {
-    /// <see href="www.russotto.net/quantumcomp.html"/>
+    /// <see href="http://www.russotto.net/quantumcomp.html"/>
    public static class Constants
    {
        public static readonly int[] PositionSlot =
--- a/SabreTools.Models/DosCenter/File.cs
+++ b/SabreTools.Models/DosCenter/File.cs
@@ -15,6 +15,9 @@ namespace SabreTools.Models.DosCenter
        [Required]
        public string? CRC { get; set; }

+        /// <remarks>sha1, attribute</remarks>
+        public string? SHA1 { get; set; }
+
        /// <remarks>date, attribute</remarks>
        public string? Date { get; set; }
    }
--- a/SabreTools.Models/GZIP/Archive.cs
+++ b/SabreTools.Models/GZIP/Archive.cs
@@ -6,13 +6,13 @@ namespace SabreTools.Models.GZIP
        /// <summary>
        /// Header including optional fields
        /// </summary>
-        public Header? Header;
+        public Header? Header { get; set; }

        // Compressed blocks live here

        /// <summary>
        /// Trailer
        /// </summary>
-        public Trailer? Trailer;
+        public Trailer? Trailer { get; set; }
    }
 }
--- a/SabreTools.Models/GZIP/ExtraFieldData.cs
+++ b/SabreTools.Models/GZIP/ExtraFieldData.cs
@@ -7,20 +7,20 @@ namespace SabreTools.Models.GZIP
        /// SI1 and SI2 provide a subfield ID, typically two ASCII letters
        /// with some mnemonic value.
        /// </summary>
-        public byte SI1;
+        public byte SubfieldID1 { get; set; }

        /// <summary>
        /// SI1 and SI2 provide a subfield ID, typically two ASCII letters
        /// with some mnemonic value.
        /// </summary>
-        public byte SI2;
+        public byte SubfieldID2 { get; set; }

        /// <summary>
        /// LEN gives the length of the subfield data, excluding the 4
        /// initial bytes.
        /// </summary>
-        public ushort LEN;
+        public ushort Length { get; set; }

-        public byte[]? Data;
+        public byte[]? Data { get; set; }
    }
 }
--- a/SabreTools.Models/GZIP/Header.cs
+++ b/SabreTools.Models/GZIP/Header.cs
@@ -6,22 +6,22 @@ namespace SabreTools.Models.GZIP
        /// <summary>
        /// IDentification 1 (0x1F)
        /// </summary>
-        public byte ID1;
+        public byte ID1 { get; set; }

        /// <summary>
        /// IDentification 2 (0x8B)
        /// </summary>
-        public byte ID2;
+        public byte ID2 { get; set; }

        /// <summary>
        /// Compression Method
        /// </summary>
-        public CompressionMethod CM;
+        public CompressionMethod CompressionMethod { get; set; }

        /// <summary>
        /// FLaGs
        /// </summary>
-        public Flags FLG;
+        public Flags Flags { get; set; }

        /// <summary>
        /// Modification TIME
@@ -35,12 +35,12 @@ namespace SabreTools.Models.GZIP
        /// compression started.  MTIME = 0 means no time stamp is
        /// available.
        /// </summary>
-        public uint MTIME;
+        public uint LastModifiedTime { get; set; }

        /// <summary>
        /// eXtra FLags
        /// </summary>
-        public ExtraFlags XFL;
+        public ExtraFlags ExtraFlags { get; set; }

        /// <summary>
        /// Operating System
@@ -49,7 +49,7 @@ namespace SabreTools.Models.GZIP
        /// took place.  This may be useful in determining end-of-line
        /// convention for text files.
        /// </summary>
-        public OperatingSystem OS;
+        public OperatingSystem OperatingSystem { get; set; }

        /// <summary>
        /// eXtra LENgth
@@ -57,7 +57,7 @@ namespace SabreTools.Models.GZIP
        /// If FLG.FEXTRA is set, this gives the length of the optional
        /// extra field.
        /// </summary>
-        public ushort XLEN;
+        public ushort ExtraLength { get; set; }

        /// <summary>
        /// Extra field
@@ -66,23 +66,23 @@ namespace SabreTools.Models.GZIP
        /// the header, with total length XLEN bytes.  It consists of a
        /// series of subfields, each of the form <see cref="ExtraFieldData"/>.
        /// </summary>
-        public ExtraFieldData[]? ExtraField;
+        public ExtraFieldData[]? ExtraField { get; set; }

        /// <summary>
-        /// Original filename before compression, zero-terminated
+        /// Original filename before compression, null-terminated
        /// </summary>
-        public string? OriginalFileName;
+        public string? OriginalFileName { get; set; }

        /// <summary>
-        /// File comment, zero terminated
+        /// File comment, null terminated
        /// </summary>
-        public string? FileComment;
+        public string? FileComment { get; set; }

        /// <summary>
        ///  The CRC16 consists of the two least significant bytes of the
        ///  CRC32 for all bytes of the gzip header up to and not including
        ///  the CRC16.
        /// </summary>
-        public ushort? CRC16;
+        public ushort? CRC16 { get; set; }
    }
 }
--- a/SabreTools.Models/GZIP/Trailer.cs
+++ b/SabreTools.Models/GZIP/Trailer.cs
@@ -13,7 +13,7 @@ namespace SabreTools.Models.GZIP
        /// ordering ISO documents. See gopher://info.itu.ch for an
        /// online version of ITU-T V.42.)
        /// </summary>
-        public uint CRC32;
+        public uint CRC32 { get; set; }

        /// <summary>
        /// Input SIZE
@@ -21,6 +21,6 @@ namespace SabreTools.Models.GZIP
        /// This contains the size of the original (uncompressed) input
        /// data modulo 2^32.
        /// </summary>
-        public uint ISIZE;
+        public uint InputSize { get; set; }
    }
 }
--- a/SabreTools.Models/LZ/Constants.cs
+++ b/SabreTools.Models/LZ/Constants.cs
@@ -0,0 +1,17 @@
+namespace SabreTools.Models.LZ
+{
+    public static class Constants
+    {
+        public const string KWAJPrefix = "KWAJ";
+
+        public static readonly byte[] KWAJSignatureBytes = [0x4B, 0x57, 0x41, 0x4A, 0x88, 0xF0, 0x27, 0xD1];
+
+        public const string QBasicPrefix = "SZ ";
+
+        public static readonly byte[] QBasicSignatureBytes = [0x53, 0x5A, 0x20, 0x88, 0xF0, 0x27, 0x33, 0xD1];
+
+        public const string SZDDPrefix = "SZDD";
+
+        public static readonly byte[] SZDDSignatureBytes = [0x53, 0x5A, 0x44, 0x44, 0x88, 0xF0, 0x27, 0x33];
+    }
+}
--- a/SabreTools.Models/LZ/Enums.cs
+++ b/SabreTools.Models/LZ/Enums.cs
@@ -0,0 +1,82 @@
+using System;
+
+namespace SabreTools.Models.LZ
+{
+    /// <see href="https://www.cabextract.org.uk/libmspack/doc/szdd_kwaj_format.html"/>
+    public enum KWAJCompressionType : ushort
+    {
+        /// <summary>
+        /// No compression
+        /// </summary>
+        NoCompression = 0,
+
+        /// <summary>
+        /// No compression, data is XORed with byte 0xFF
+        /// </summary>
+        NoCompressionXor = 1,
+
+        /// <summary>
+        /// The same compression method as the QBasic variant of SZDD
+        /// </summary>
+        QBasic = 2,
+
+        /// <summary>
+        /// LZ + Huffman "Jeff Johnson" compression
+        /// </summary>
+        LZH = 3,
+
+        /// <summary>
+        /// MS-ZIP
+        /// </summary>
+        MSZIP = 4,
+    }
+
+    /// <see href="https://www.cabextract.org.uk/libmspack/doc/szdd_kwaj_format.html"/>
+    [Flags]
+    public enum KWAJHeaderFlags : ushort
+    {
+        /// <summary>
+        /// Header extensions contains 4-byte decompressed length
+        /// </summary>
+        HasDecompressedLength = 0x0001,
+
+        /// <summary>
+        /// Header extensions contains 2-byte unknown value
+        /// </summary>
+        HasUnknownFlag = 0x0002,
+
+        /// <summary>
+        /// Header extensions contains 2-byte prefix followed by
+        /// that many bytes of (unknown purpose) data
+        /// </summary>
+        HasPrefixedData = 0x0004,
+
+        /// <summary>
+        /// Header extensions contains null-terminated string of
+        /// max length 8 representing the file name
+        /// </summary>
+        HasFileName = 0x0008,
+
+        /// <summary>
+        /// Header extensions contains null-terminated string of
+        /// max length 3 representing the file name
+        /// </summary>
+        HasFileExtension = 0x0010,
+
+        /// <summary>
+        /// Header extensions contains 2-byte prefix followed by
+        /// that many bytes of (arbitrary text) data
+        /// </summary>
+        HasAdditionalText = 0x0020,
+    }
+
+    /// <see href="https://github.com/wine-mirror/wine/blob/master/dlls/kernel32/lzexpand.c"/>
+    /// <see href="https://www.cabextract.org.uk/libmspack/doc/szdd_kwaj_format.html"/>
+    public enum ExpandCompressionType : byte
+    {
+        /// <summary>
+        /// Only valid compression type: 'A'
+        /// </summary>
+        A = 0x41,
+    }
+}
--- a/SabreTools.Models/LZ/KWAJFile.cs
+++ b/SabreTools.Models/LZ/KWAJFile.cs
@@ -0,0 +1,21 @@
+namespace SabreTools.Models.LZ
+{
+    /// <summary>
+    /// LZ variant with variable compression
+    /// </summary>
+    /// <see href="https://www.cabextract.org.uk/libmspack/doc/szdd_kwaj_format.html"/>
+    public sealed class KWAJFile
+    {
+        /// <summary>
+        /// Header
+        /// </summary>
+        public KWAJHeader? Header { get; set; }
+
+        /// <summary>
+        /// Optional extensions defined by <see cref="KWAJHeader.HeaderFlags"/> 
+        /// </summary>
+        public KWAJHeaderExtensions? HeaderExtensions { get; set; }
+
+        // Followed immediately by compressed data
+    }
+}
--- a/SabreTools.Models/LZ/KWAJHeader.cs
+++ b/SabreTools.Models/LZ/KWAJHeader.cs
@@ -0,0 +1,35 @@
+using System.Runtime.InteropServices;
+
+namespace SabreTools.Models.LZ
+{
+    /// <summary>
+    /// LZ variant with variable compression
+    /// </summary>
+    /// <see href="https://www.cabextract.org.uk/libmspack/doc/szdd_kwaj_format.html"/>
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+    public sealed class KWAJHeader
+    {
+        /// <summary>
+        /// "KWAJ" signature
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8)]
+        public byte[]? Magic;
+
+        /// <summary>
+        /// Compression method
+        /// </summary>
+        [MarshalAs(UnmanagedType.U2)]
+        public KWAJCompressionType CompressionType;
+
+        /// <summary>
+        /// File offset of compressed data
+        /// </summary>
+        public ushort DataOffset;
+
+        /// <summary>
+        /// Header flags to mark header extensions
+        /// </summary>
+        [MarshalAs(UnmanagedType.U2)]
+        public KWAJHeaderFlags HeaderFlags;
+    }
+}
--- a/SabreTools.Models/LZ/KWAJHeaderExtensions.cs
+++ b/SabreTools.Models/LZ/KWAJHeaderExtensions.cs
@@ -0,0 +1,51 @@
+namespace SabreTools.Models.LZ
+{
+    /// <summary>
+    /// Additional information stored after the KWAJ header
+    /// </summary>
+    /// <see href="https://www.cabextract.org.uk/libmspack/doc/szdd_kwaj_format.html"/>
+    public sealed class KWAJHeaderExtensions
+    {
+        /// <summary>
+        /// Decompressed length of file
+        /// </summary>
+        public uint? DecompressedLength { get; set; }
+
+        /// <summary>
+        /// Unknown purpose
+        /// </summary>
+        public ushort? UnknownPurpose { get; set; }
+
+        /// <summary>
+        /// Length of <see cref="UnknownData"/> 
+        /// </summary>
+        public ushort? UnknownDataLength { get; set; }
+
+        /// <summary>
+        /// Unknown purpose data whose length is defined
+        /// by <see cref="UnknownDataLength"/>
+        /// </summary>
+        public byte[]? UnknownData { get; set; }
+
+        /// <summary>
+        /// Null-terminated string with max length 8: file name
+        /// </summary>
+        public string? FileName { get; set; }
+
+        /// <summary>
+        /// Null-terminated string with max length 3: file extension
+        /// </summary>
+        public string? FileExtension { get; set; }
+
+        /// <summary>
+        /// Length of <see cref="ArbitraryText"/> 
+        /// </summary>
+        public ushort? ArbitraryTextLength { get; set; }
+
+        /// <summary>
+        /// Arbitrary text data whose length is defined
+        /// by <see cref="ArbitraryTextLength"/>
+        /// </summary>
+        public byte[]? ArbitraryText { get; set; }
+    }
+}
--- a/SabreTools.Models/LZ/QBasicFile.cs
+++ b/SabreTools.Models/LZ/QBasicFile.cs
@@ -0,0 +1,16 @@
+namespace SabreTools.Models.LZ
+{
+    /// <summary>
+    /// LZ variant used in QBasic 4.5 installer
+    /// </summary>
+    /// <see href="https://www.cabextract.org.uk/libmspack/doc/szdd_kwaj_format.html"/>
+    public sealed class QBasicFile
+    {
+        /// <summary>
+        /// Header
+        /// </summary>
+        public QBasicHeader? Header { get; set; }
+
+        // Followed immediately by compressed data
+    }
+}
--- a/SabreTools.Models/LZ/QBasicHeader.cs
+++ b/SabreTools.Models/LZ/QBasicHeader.cs
@@ -0,0 +1,23 @@
+using System.Runtime.InteropServices;
+
+namespace SabreTools.Models.LZ
+{
+    /// <summary>
+    /// LZ variant used in QBasic 4.5 installer
+    /// </summary>
+    /// <see href="https://www.cabextract.org.uk/libmspack/doc/szdd_kwaj_format.html"/>
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+    public sealed class QBasicHeader
+    {
+        /// <summary>
+        /// "SZ" signature
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8)]
+        public byte[]? Magic;
+
+        /// <summary>
+        /// The integer length of the file when unpacked
+        /// </summary>
+        public uint RealLength;
+    }
+}
--- a/SabreTools.Models/LZ/SZDDFile.cs
+++ b/SabreTools.Models/LZ/SZDDFile.cs
@@ -0,0 +1,17 @@
+namespace SabreTools.Models.LZ
+{
+    /// <summary>
+    /// Standard LZ variant
+    /// </summary>
+    /// <see href="https://github.com/wine-mirror/wine/blob/master/dlls/kernel32/lzexpand.c"/>
+    /// <see href="https://www.cabextract.org.uk/libmspack/doc/szdd_kwaj_format.html"/>
+    public sealed class SZDDFile
+    {
+        /// <summary>
+        /// Header
+        /// </summary>
+        public SZDDHeader? Header { get; set; }
+
+        // Followed immediately by compressed data
+    }
+}
--- a/SabreTools.Models/LZ/SZDDHeader.cs
+++ b/SabreTools.Models/LZ/SZDDHeader.cs
@@ -0,0 +1,38 @@
+using System.Runtime.InteropServices;
+
+namespace SabreTools.Models.LZ
+{
+    /// <summary>
+    /// Standard LZ variant
+    /// </summary>
+    /// <see href="https://github.com/wine-mirror/wine/blob/master/dlls/kernel32/lzexpand.c"/>
+    /// <see href="https://www.cabextract.org.uk/libmspack/doc/szdd_kwaj_format.html"/>
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+    public sealed class SZDDHeader
+    {
+        /// <summary>
+        /// "SZDD" signature
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8)]
+        public byte[]? Magic;
+
+        /// <summary>
+        /// Compression mode
+        /// </summary>
+        /// <remarks>Only <see cref="ExpandCompressionType.A"/> is supported</remarks> 
+        [MarshalAs(UnmanagedType.U1)]
+        public ExpandCompressionType CompressionType;
+
+        /// <summary>
+        /// The character missing from the end of the filename
+        /// </summary>
+        /// <remarks>0 means unknown</remarks>
+        [MarshalAs(UnmanagedType.U1)]
+        public char LastChar;
+
+        /// <summary>
+        /// The integer length of the file when unpacked
+        /// </summary>
+        public uint RealLength;
+    }
+}
--- a/SabreTools.Models/Listxml/Mess.cs
+++ b/SabreTools.Models/Listxml/Mess.cs
@@ -0,0 +1,16 @@
+using System.Xml;
+using System.Xml.Serialization;
+
+namespace SabreTools.Models.Listxml
+{
+    [XmlRoot("mess")]
+    public class Mess
+    {
+        [XmlAttribute("version")]
+        public string? Version { get; set; }
+
+        [XmlElement("machine", typeof(Machine))]
+        [XmlElement("game", typeof(Game))]
+        public GameBase[]? Game { get; set; }
+    }
+}
--- a/SabreTools.Models/Logiqx/Dir.cs
+++ b/SabreTools.Models/Logiqx/Dir.cs
@@ -10,6 +10,9 @@ namespace SabreTools.Models.Logiqx
        [XmlAttribute("name")]
        public string? Name { get; set; }

+        [XmlElement("dir", typeof(Dir))]
+        public Dir[]? Subdir { get; set; }
+
        [XmlElement("game", typeof(Game))]
        [XmlElement("machine", typeof(Machine))]
        public GameBase[]? Game { get; set; }
--- a/SabreTools.Models/Metadata/DictionaryBase.cs
+++ b/SabreTools.Models/Metadata/DictionaryBase.cs
@@ -100,7 +100,7 @@ namespace SabreTools.Models.Metadata

            string[]? asArray = Read<string[]>(key);
            if (asArray != null)
-#if NETFRAMEWORK
+#if NETFRAMEWORK || NETSTANDARD2_0
                return string.Join(",", asArray);
 #else
                return string.Join(',', asArray);
--- a/SabreTools.Models/MoPaQ/ArchiveHeader.cs
+++ b/SabreTools.Models/MoPaQ/ArchiveHeader.cs
@@ -128,7 +128,7 @@
        /// <summary>
        /// Compressed size of the BET block
        /// </summary>
-        public ulong BetTablesize { get; set; }
+        public ulong BetTableSize { get; set; }

        /// <summary>
        /// Size of raw data chunk to calculate MD5.
--- a/SabreTools.Models/NewExecutable/EntryTableBundle.cs
+++ b/SabreTools.Models/NewExecutable/EntryTableBundle.cs
@@ -18,7 +18,7 @@
    /// entry points within this bundle by their ordinal number. The following
    /// describes the format of the entry table bundles.
    /// </remarks>
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
    public sealed class EntryTableBundle
    {
        /// <summary>
--- a/SabreTools.Models/NewExecutable/Enums.cs
+++ b/SabreTools.Models/NewExecutable/Enums.cs
@@ -148,6 +148,7 @@ namespace SabreTools.Models.NewExecutable

    public enum OperatingSystem : byte
    {
+        Unknown = 0x00,
        OS2 = 0x01,
        WINDOWS = 0x02,
        EU_MSDOS4 = 0x03,
--- a/SabreTools.Models/NewExecutable/Executable.cs
+++ b/SabreTools.Models/NewExecutable/Executable.cs
@@ -10,7 +10,8 @@ namespace SabreTools.Models.NewExecutable
    /// internal data used by the loader to manage the loaded executable
    /// modules in the system and to support dynamic linking.
    /// </summary>
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://wiki.osdev.org/NE"/>
    public sealed class Executable
    {
        /// <summary>
@@ -57,5 +58,10 @@ namespace SabreTools.Models.NewExecutable
        /// Nonresident-Name table
        /// </summary>
        public NonResidentNameTableEntry[]? NonResidentNameTable { get; set; }
+
+        /// <summary>
+        /// Segment relocation data
+        /// </summary>
+        public PerSegmentData[]? SegmentRelocationData { get; set; }
    }
 }
--- a/SabreTools.Models/NewExecutable/ExecutableHeader.cs
+++ b/SabreTools.Models/NewExecutable/ExecutableHeader.cs
@@ -6,15 +6,14 @@ namespace SabreTools.Models.NewExecutable
    /// The NE header is a relatively large structure with multiple characteristics.
    /// Because of the age of the format some items are unclear in meaning.
    /// </summary>
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
    /// <see href="https://github.com/libyal/libexe/blob/main/documentation/Executable%20(EXE)%20file%20format.asciidoc#24-ne-extended-header"/>
+    /// <see href="https://wiki.osdev.org/NE"/>
    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
    public sealed class ExecutableHeader
    {
        /// <summary>
-        /// Signature word.
-        /// "N" is low-order byte.
-        /// "E" is high-order byte.
+        /// "NE"
        /// </summary>
        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 2)]
        public string? Magic;
@@ -22,20 +21,22 @@ namespace SabreTools.Models.NewExecutable
        /// <summary>
        /// Version number of the linker.
        /// </summary>
+        /// <remarks>Also known as the major linker version</remarks>
        public byte LinkerVersion;
-        
+
        /// <summary>
        /// Revision number of the linker.
        /// </summary>
+        /// <remarks>Also known as the minor linker version</remarks>
        public byte LinkerRevision;
-        
+
        /// <summary>
        /// Entry Table file offset, relative to the beginning of the segmented EXE header.
        /// </summary>
        public ushort EntryTableOffset;
-        
+
        /// <summary>
-        /// Number of bytes in the entry table.
+        /// Length of entry table in bytes
        /// </summary>
        public ushort EntryTableSize;

@@ -81,12 +82,15 @@ namespace SabreTools.Models.NewExecutable
        /// <summary>
        /// Segment number:offset of CS:IP.
        /// </summary>
+        /// <remarks>CS:IP entry point, CS is index into segment table</remarks>
        public uint InitialCSIPSetting;

        /// <summary>
        /// Segment number:offset of SS:SP.
        /// </summary>
        /// <remarks>
+        /// SS:SP initial stack pointer, SS is index into segment table
+        /// 
        /// If SS equals the automatic data segment and SP equals
        /// zero, the stack pointer is set to the top of the
        /// automatic data segment just below the additional heap
@@ -105,7 +109,7 @@ namespace SabreTools.Models.NewExecutable
        public ushort ModuleReferenceTableSize;

        /// <summary>
-        /// Number of bytes in the Non-Resident Name Table.
+        /// Size of non-resident names table in bytes
        /// </summary>
        public ushort NonResidentNameTableSize;

@@ -166,18 +170,20 @@ namespace SabreTools.Models.NewExecutable
        /// </summary>
        [MarshalAs(UnmanagedType.U1)]
        public OperatingSystem TargetOperatingSystem;
-        
+
+        #region OS/2 Specific
+
        /// <summary>
        /// Other OS/2 flags
        /// </summary>
        [MarshalAs(UnmanagedType.U1)]
        public OS2Flag AdditionalFlags;
-        
+
        /// <summary>
        /// Offset to return thunks or start of gangload area
        /// </summary>
        public ushort ReturnThunkOffset;
-        
+
        /// <summary>
        /// Offset to segment reference thunks or size of gangload area
        /// </summary>
@@ -187,15 +193,17 @@ namespace SabreTools.Models.NewExecutable
        /// Minimum code swap area size
        /// </summary>
        public ushort MinCodeSwapAreaSize;
-        
+
        /// <summary>
        /// Windows SDK revison number
        /// </summary>
        public byte WindowsSDKRevision;
-        
+
        /// <summary>
        /// Windows SDK version number
        /// </summary>
        public byte WindowsSDKVersion;
+
+        #endregion
    }
 }
--- a/SabreTools.Models/NewExecutable/ImportNameRelocationRecord.cs
+++ b/SabreTools.Models/NewExecutable/ImportNameRelocationRecord.cs
@@ -2,7 +2,7 @@

 namespace SabreTools.Models.NewExecutable
 {
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
    [StructLayout(LayoutKind.Sequential)]
    public sealed class ImportNameRelocationRecord
    {
--- a/SabreTools.Models/NewExecutable/ImportOrdinalRelocationRecord.cs
+++ b/SabreTools.Models/NewExecutable/ImportOrdinalRelocationRecord.cs
@@ -2,7 +2,7 @@

 namespace SabreTools.Models.NewExecutable
 {
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
    [StructLayout(LayoutKind.Sequential)]
    public sealed class ImportOrdinalRelocationRecord
    {
--- a/SabreTools.Models/NewExecutable/ImportedNameTableEntry.cs
+++ b/SabreTools.Models/NewExecutable/ImportedNameTableEntry.cs
@@ -8,7 +8,7 @@
    /// characters. The strings are not null-terminated and are case
    /// sensitive.
    /// </summary>
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
    public sealed class ImportedNameTableEntry
    {
        /// <summary>
--- a/SabreTools.Models/NewExecutable/InternalRefRelocationRecord.cs
+++ b/SabreTools.Models/NewExecutable/InternalRefRelocationRecord.cs
@@ -2,7 +2,7 @@

 namespace SabreTools.Models.NewExecutable
 {
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
    [StructLayout(LayoutKind.Sequential)]
    public sealed class InternalRefRelocationRecord
    {
@@ -13,7 +13,7 @@ namespace SabreTools.Models.NewExecutable
        public byte SegmentNumber;

        /// <summary>
-        /// 0
+        /// Always 0
        /// </summary>
        public byte Reserved;

--- a/SabreTools.Models/NewExecutable/ModuleReferenceTableEntry.cs
+++ b/SabreTools.Models/NewExecutable/ModuleReferenceTableEntry.cs
@@ -7,7 +7,7 @@ namespace SabreTools.Models.NewExecutable
    /// contains an offset for the module-name string within the imported-
    /// names table; each entry is 2 bytes long.
    /// </summary>
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
    [StructLayout(LayoutKind.Sequential)]
    public sealed class ModuleReferenceTableEntry
    {
--- a/SabreTools.Models/NewExecutable/NonResidentNameTableEntry.cs
+++ b/SabreTools.Models/NewExecutable/NonResidentNameTableEntry.cs
@@ -8,7 +8,7 @@
    /// strings follow the same format as those defined in the resident name
    /// table.
    /// </summary>
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
    public sealed class NonResidentNameTableEntry
    {
        /// <summary>
--- a/SabreTools.Models/NewExecutable/OSFixupRelocationRecord.cs
+++ b/SabreTools.Models/NewExecutable/OSFixupRelocationRecord.cs
@@ -2,7 +2,7 @@

 namespace SabreTools.Models.NewExecutable
 {
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
    [StructLayout(LayoutKind.Sequential)]
    public sealed class OSFixupRelocationRecord
    {
--- a/SabreTools.Models/NewExecutable/PerSegmentData.cs
+++ b/SabreTools.Models/NewExecutable/PerSegmentData.cs
@@ -7,7 +7,14 @@
    /// follow the segment data in the file. The relocation fixup information
    /// is defined as follows:
    /// </summary>
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <remarks>
+    /// To find the relocation data for a segment, seek to:
+    ///     <see cref="SegmentTableEntry.Offset"/>
+    ///     * (1 << <see cref="ExecutableHeader.SegmentAlignmentShiftCount"/>)
+    ///     + <see cref="SegmentTableEntry.Length"/> 
+    /// </remarks>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://wiki.osdev.org/NE"/>
    public sealed class PerSegmentData
    {
        /// <summary>
--- a/SabreTools.Models/NewExecutable/RelocationRecord.cs
+++ b/SabreTools.Models/NewExecutable/RelocationRecord.cs
@@ -4,7 +4,7 @@
    /// A table of relocation records follows. The following is the format
    /// of each relocation record.
    /// </summary>
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
    public sealed class RelocationRecord
    {
        /// <summary>
@@ -33,25 +33,25 @@
        /// <summary>
        /// INTERNALREF
        /// </summary>
-        /// <remarks>Must be <c>NULL</c> if <see cref="Flags"/> is not set to <see cref="RelocationRecordFlag.INTERNALREF"/></remarks>
+        /// <remarks>Must be null if <see cref="Flags"/> is not set to <see cref="RelocationRecordFlag.INTERNALREF"/></remarks>
        public InternalRefRelocationRecord? InternalRefRelocationRecord { get; set; }

        /// <summary>
        /// IMPORTNAME
        /// </summary>
-        /// <remarks>Must be <c>NULL</c> if <see cref="Flags"/> is not set to <see cref="RelocationRecordFlag.IMPORTNAME"/></remarks>
+        /// <remarks>Must be null if <see cref="Flags"/> is not set to <see cref="RelocationRecordFlag.IMPORTNAME"/></remarks>
        public ImportNameRelocationRecord? ImportNameRelocationRecord { get; set; }

        /// <summary>
        /// IMPORTORDINAL
        /// </summary>
-        /// <remarks>Must be <c>NULL</c> if <see cref="Flags"/> is not set to <see cref="RelocationRecordFlag.IMPORTORDINAL"/></remarks>
+        /// <remarks>Must be null if <see cref="Flags"/> is not set to <see cref="RelocationRecordFlag.IMPORTORDINAL"/></remarks>
        public ImportOrdinalRelocationRecord? ImportOrdinalRelocationRecord { get; set; }

        /// <summary>
        /// IMPORTORDINAL
        /// </summary>
-        /// <remarks>Must be <c>NULL</c> if <see cref="Flags"/> is not set to <see cref="RelocationRecordFlag.OSFIXUP"/></remarks>
+        /// <remarks>Must be null if <see cref="Flags"/> is not set to <see cref="RelocationRecordFlag.OSFIXUP"/></remarks>
        public OSFixupRelocationRecord? OSFixupRelocationRecord { get; set; }
    }
 }
--- a/SabreTools.Models/NewExecutable/ResidentNameTableEntry.cs
+++ b/SabreTools.Models/NewExecutable/ResidentNameTableEntry.cs
@@ -7,7 +7,7 @@
    /// are case-sensitive and are not null-terminated. The following
    /// describes the format of the name strings:
    /// </summary>
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
    public sealed class ResidentNameTableEntry
    {
        /// <summary>
--- a/SabreTools.Models/NewExecutable/ResourceTable.cs
+++ b/SabreTools.Models/NewExecutable/ResourceTable.cs
@@ -12,7 +12,7 @@ namespace SabreTools.Models.NewExecutable
    /// resource. It also defines the location and size of the resource. The
    /// following describes the contents of each of these structures:
    /// </summary>
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
    public sealed class ResourceTable
    {
        /// <summary>
--- a/SabreTools.Models/NewExecutable/ResourceTypeAndNameString.cs
+++ b/SabreTools.Models/NewExecutable/ResourceTypeAndNameString.cs
@@ -5,7 +5,7 @@
    /// resource table. Note that these strings are NOT null terminated and
    /// are case sensitive.
    /// </summary>
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
    public sealed class ResourceTypeAndNameString
    {
        /// <summary>
--- a/SabreTools.Models/NewExecutable/ResourceTypeInformationEntry.cs
+++ b/SabreTools.Models/NewExecutable/ResourceTypeInformationEntry.cs
@@ -4,7 +4,7 @@
    /// A table of resource type information blocks follows. The following
    /// is the format of each type information block:
    /// </summary>
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
    public sealed class ResourceTypeInformationEntry
    {
        /// <summary>
--- a/SabreTools.Models/NewExecutable/ResourceTypeResourceEntry.cs
+++ b/SabreTools.Models/NewExecutable/ResourceTypeResourceEntry.cs
@@ -6,7 +6,8 @@ namespace SabreTools.Models.NewExecutable
    /// A table of resources for this type follows. The following is
    /// the format of each resource (8 bytes each):
    /// </summary>
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://wiki.osdev.org/NE"/>
    [StructLayout(LayoutKind.Sequential)]
    public sealed class ResourceTypeResourceEntry
    {
@@ -16,11 +17,13 @@ namespace SabreTools.Models.NewExecutable
        /// of the alignment shift count value specified at
        /// beginning of the resource table.
        /// </summary>
+        /// <remarks>Byte offset is: Offset * (1 << <see cref="ResourceTable.AlignmentShiftCount"/>)</remarks>
        public ushort Offset;

        /// <summary>
        /// Length of the resource in the file (in bytes).
        /// </summary>
+        /// <remarks>Byte length is: Length * (1 << <see cref="ResourceTable.AlignmentShiftCount"/>)</remarks>
        public ushort Length;

        /// <summary>
--- a/SabreTools.Models/NewExecutable/SegmentTableEntry.cs
+++ b/SabreTools.Models/NewExecutable/SegmentTableEntry.cs
@@ -8,7 +8,8 @@ namespace SabreTools.Models.NewExecutable
    /// EXE header. The first entry in the segment table is segment number 1.
    /// The following is the structure of a segment table entry.
    /// </summary>
-    /// <see href="http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://web.archive.org/web/20240422070115/http://bytepointer.com/resources/win16_ne_exe_format_win3.0.htm"/>
+    /// <see href="https://wiki.osdev.org/NE"/>
    [StructLayout(LayoutKind.Sequential)]
    public sealed class SegmentTableEntry
    {
@@ -17,12 +18,13 @@ namespace SabreTools.Models.NewExecutable
        /// data, relative to the beginning of the file. Zero means no
        /// file data.
        /// </summary>
-        public ushort Offset;
+        /// <remarks>Byte offset is: Offset * (1 << <see cref="ExecutableHeader.SegmentAlignmentShiftCount"/>)</remarks>
+        public ushort Offset { get; set; }

        /// <summary>
        /// Length of the segment in the file, in bytes. Zero means 64K.
        /// </summary>
-        public ushort Length;
+        public ushort Length { get; set; }

        /// <summary>
        /// Flag word.
@@ -34,6 +36,25 @@ namespace SabreTools.Models.NewExecutable
        /// Minimum allocation size of the segment, in bytes. Total size
        /// of the segment. Zero means 64K.
        /// </summary>
-        public ushort MinimumAllocationSize;
+        public ushort MinimumAllocationSize { get; set; }
+
+        /// <summary>
+        /// Segment data
+        /// </summary>
+        /// <remarks>
+        /// Data is not sequential to the entry header. It lives at
+        /// the <see cref="Offset"/> and has a size of <see cref="Length"/>
+        /// </remarks>
+        public byte[]? Data { get; set; }
+
+        /// <summary>
+        /// Per-segment data
+        /// </summary>
+        /// <remarks>
+        /// This only exists if <see cref="FlagWord"/> has a flag value
+        /// of <see cref="SegmentTableEntryFlag.RELOCINFO"/>. It immediately
+        /// follows <see cref="Data"/>.
+        /// </remarks>
+        public PerSegmentData? PerSegmentData { get; set; }
    }
 }
--- a/SabreTools.Models/OLE/ArrayDimension.cs
+++ b/SabreTools.Models/OLE/ArrayDimension.cs
@@ -0,0 +1,23 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The ArrayDimension packet represents the size and index offset of a dimension of an array
+    /// property type.
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class ArrayDimension
+    {
+        /// <summary>
+        /// An unsigned integer representing the size of the dimension.
+        /// </summary>
+        public uint Size { get; set; }
+
+        /// <summary>
+        /// A signed integer representing the index offset of the dimension. For
+        /// example, an array dimension that is to be accessed with a 0-based index would have the value
+        /// zero, whereas an array dimension that is to be accessed with a 1-based index would have the
+        /// value 0x00000001.
+        /// </summary>
+        public int Value { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/ArrayHeader.cs
+++ b/SabreTools.Models/OLE/ArrayHeader.cs
@@ -0,0 +1,29 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The ArrayHeader packet represents the type and dimensions of an array property type.
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class ArrayHeader
+    {
+        /// <summary>
+        /// MUST be set to the value obtained by clearing the VT_ARRAY (0x2000) bit of
+        /// this array property's PropertyType value.
+        /// </summary>
+        public PropertyType Type { get; set; }
+
+        /// <summary>
+        /// An unsigned integer representing the number of dimensions in the array
+        /// property. MUST be at least 1 and at most 31.
+        /// </summary>
+        public uint NumDimensions { get; set; }
+
+        /// <summary>
+        /// MUST be a sequence of ArrayDimension packets
+        /// 
+        /// The number of scalar values in an array property can be calculated from the ArrayHeader packet
+        /// as the product of the Size fields of each of the ArrayDimension packets.
+        /// </summary>
+        public ArrayDimension[]? Dimensions { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/BLOB.cs
+++ b/SabreTools.Models/OLE/BLOB.cs
@@ -0,0 +1,19 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The BLOB packet represents binary data
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class BLOB
+    {
+        /// <summary>
+        /// The size in bytes of the <see cref="Bytes"> field, not including padding (if any)
+        /// </summary>
+        public uint Size { get; set; }
+
+        /// <summary>
+        /// MUST be an array of bytes, followed by zero padding to a multiple of 4 bytes.
+        /// </summary>
+        public byte[]? Bytes { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/CURRENCY.cs
+++ b/SabreTools.Models/OLE/CURRENCY.cs
@@ -0,0 +1,15 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The CURRENCY (Packet Version) packet represents a CURRENCY as specified in [MS-OAUT]
+    /// section 2.2.24.
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class CURRENCY
+    {
+        /// <summary>
+        /// The value of the int64 field specified in [MS-OAUT] section 2.2.24.
+        /// </summary>
+        public ulong Value { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/ClipboardData.cs
+++ b/SabreTools.Models/OLE/ClipboardData.cs
@@ -0,0 +1,26 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The ClipboardData packet represents clipboard data
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class ClipboardData
+    {
+        /// <summary>
+        /// The total size in bytes of the <see cref="Format"> and <see cref="Data"> fields,
+        /// not including padding (if any).
+        /// </summary>
+        public uint Size { get; set; }
+
+        /// <summary>
+        /// An application-specific identifier for the format of the data in the
+        /// <see cref="Data"> field.
+        /// </summary>
+        public uint Format { get; set; }
+
+        /// <summary>
+        /// MUST be an array of bytes, followed by zero padding to a multiple of 4 bytes
+        /// </summary>
+        public byte[]? Data { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/CodePageString.cs
+++ b/SabreTools.Models/OLE/CodePageString.cs
@@ -0,0 +1,33 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The CodePageString packet represents a string whose encoding depends on the
+    /// value of the property set's CodePage property.
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class CodePageString
+    {
+        /// <summary>
+        /// The size in bytes of the <see cref="Characters"/> field, including the null terminator,
+        /// but not including padding (if any). If the property set's CodePage property
+        /// has the value CP_WINUNICODE (0x04B0), then the value MUST be a multiple of 2
+        /// </summary>
+        public uint Size { get; set; }
+
+        /// <summary>
+        /// If <see cref="Size"/> is zero, this field MUST be zero bytes in length. If <see cref="Size"/>
+        /// is nonzero and the CodePage property set's CodePage property has the value CP_WINUNICODE (0x04B0),
+        /// then the value MUST be a null-terminated array of 16-bit Unicode characters, followed by zero
+        /// padding to a multiple of 4 bytes. If <see cref="Size"/> is nonzero and the property set's CodePage
+        /// property has any other value, it MUST be a null-terminated array of 8-bit characters from the code
+        /// page identified by the CodePage property, followed by zero padding to a multiple of 4 bytes. The
+        /// string represented by this field MAY contain embedded or additional trailing null characters and
+        /// an OLEPS implementation MUST be able to handle such strings. However, the manner in which
+        /// strings with embedded or additional trailing null characters are presented by the implementation
+        /// to an application is implementation-specific. For maximum interoperability, an OLEPS
+        /// implementation SHOULD NOT write strings with embedded or trailing null characters unless
+        /// specifically requested to do so by an application.
+        /// </summary>
+        public string? Characters { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/Constants.cs
+++ b/SabreTools.Models/OLE/Constants.cs
@@ -0,0 +1,90 @@
+namespace SabreTools.Models.OLE
+{
+    public static class Constants
+    {
+        #region Format IDs
+
+        public const string SummaryInformationFMTIDString = "F29F85E0-4FF9-1068-AB91-08002B27B3D9";
+        public static readonly GUID SummaryInformationFMTIDGUID = new()
+        {
+            Data1 = 0xF29F85E0,
+            Data2 = 0x4FF9,
+            Data3 = 0x1068,
+            Data4 = [0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9],
+        };
+
+        public const string DocSummaryInformationFMTIDString = "D5CDD502-2E9C-101B-9397-08002B2CF9AE";
+        public static readonly GUID DocSummaryInformationFMTIDGUID = new()
+        {
+            Data1 = 0xD5CDD502,
+            Data2 = 0x2E9C,
+            Data3 = 0x101B,
+            Data4 = [0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE],
+        };
+
+        public const string UserDefinedPropertiesFMTIDString = "D5CDD502-2E9C-101B-9397-08002B2CF9AE";
+        public static readonly GUID UserDefinedPropertiesFMTIDGUID = new()
+        {
+            Data1 = 0xD5CDD502,
+            Data2 = 0x2E9C,
+            Data3 = 0x101B,
+            Data4 = [0x93, 0x97, 0x08, 0x00, 0x2B, 0x2C, 0xF9, 0xAE],
+        };
+
+        public const string GlobalInfoFMTIDString = "56616F00-C154-11CE-8553-00AA00A1F95B";
+        public static readonly GUID GlobalInfoFMTIDGUID = new()
+        {
+            Data1 = 0x56616F00,
+            Data2 = 0xC154,
+            Data3 = 0x11CE,
+            Data4 = [0x85, 0x53, 0x00, 0xAA, 0x00, 0xA1, 0xF9, 0x5B],
+        };
+
+        public const string ImageContentsFMTIDString = "556616400-C154-11CE-8553-00AA00A1F95B";
+        public static readonly GUID ImageContentsFMTIDGUID = new()
+        {
+            Data1 = 0x56616F00,
+            Data2 = 0xC154,
+            Data3 = 0x11CE,
+            Data4 = [0x85, 0x53, 0x00, 0xAA, 0x00, 0xA1, 0xF9, 0x5B],
+        };
+
+        public const string ImageInfoFMTIDString = "556616400-C154-11CE-8553-00AA00A1F95B";
+        public static readonly GUID ImageInfoFMTIDGUID = new()
+        {
+            Data1 = 0x56616F00,
+            Data2 = 0xC154,
+            Data3 = 0x11CE,
+            Data4 = [0x85, 0x53, 0x00, 0xAA, 0x00, 0xA1, 0xF9, 0x5B],
+        };
+
+        public const string PropertyBagFMTIDString = "20001801-5DE6-11D1-8E38-00C04FB9386D";
+        public static readonly GUID PropertyBagFMTIDGUID = new()
+        {
+            Data1 = 0x20001801,
+            Data2 = 0x5DE6,
+            Data3 = 0x11D1,
+            Data4 = [0x8E, 0x38, 0x00, 0xC0, 0x4F, 0xB9, 0x38, 0x6D],
+        };
+
+        #endregion
+
+        #region Stream or Storage Names
+
+        public static readonly string SummaryInformationName = (byte)0x05 + "SummaryInformation";
+
+        public static readonly string DocSummaryInformationName = (byte)0x05 + "DocumentSummaryInformation";
+
+        public static readonly string UserDefinedPropertiesName = (byte)0x05 + "DocumentSummaryInformation";
+
+        public static readonly string GlobalInfoName = (byte)0x05 + "GlobalInfo";
+
+        public static readonly string ImageContentsName = (byte)0x05 + "ImageContents";
+
+        public static readonly string ImageInfoName = (byte)0x05 + "ImageInfo";
+
+        public const string ControlStreamName = "{4c8cc155-6c1e-11d1-8e41-00c04fb9386d}";
+
+        #endregion
+    }
+}
--- a/SabreTools.Models/OLE/ControlStream.cs
+++ b/SabreTools.Models/OLE/ControlStream.cs
@@ -0,0 +1,35 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// A file that has one or more property sets associated with it through the alternate
+    /// stream binding MUST have a control stream, which is an alternate stream with the name
+    /// "{4c8cc155-6c1e-11d1-8e41-00c04fb9386d}". This stream MUST contain the following packet.
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class ControlStream
+    {
+        /// <summary>
+        /// MUST be set to zero, and nonzero values MUST be rejected.
+        /// </summary>
+        public ushort Reserved1 { get; set; }
+
+        /// <summary>
+        /// MUST be set to zero, and MUST be ignored.
+        /// </summary>
+        public ushort Reserved2 { get; set; }
+
+        /// <summary>
+        /// An application-provided value that MUST NOT be interpreted by the
+        /// OLEPS implementation. If the application did not provide a value,
+        /// it SHOULD be set to zero.
+        /// </summary>
+        public uint ApplicationState { get; set; }
+
+        /// <summary>
+        /// An application-provided value that MUST NOT be interpreted by the
+        /// OLEPS implementation. If the application did not provide a value,
+        /// it SHOULD be absent.
+        /// </summary>
+        public GUID? CLSID { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/DATE.cs
+++ b/SabreTools.Models/OLE/DATE.cs
@@ -0,0 +1,16 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The DATE (Packet Version) packet represents a DATE as specified in [MS-OAUT]
+    /// section 2.2.25
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class DATE
+    {
+        /// <summary>
+        /// The value of the DATE is an 8-byte IEEE floating-point number, as specified in
+        /// [MS-OAUT] section 2.2.25.
+        /// </summary>
+        public ulong Value { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/DECIMAL.cs
+++ b/SabreTools.Models/OLE/DECIMAL.cs
@@ -0,0 +1,35 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The DECIMAL (Packet Version) packet represents a DECIMAL as specified in [MS-OAUT] section
+    /// 2.2.26
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class DECIMAL
+    {
+        /// <summary>
+        /// MUST be set to zero and MUST be ignored
+        /// </summary>
+        public ushort Reserved { get; set; }
+
+        /// <summary>
+        /// The value of the scale field specified in [MS-OAUT] section 2.2.26
+        /// </summary>
+        public byte Scale { get; set; }
+
+        /// <summary>
+        /// The value of the sign field specified in [MS-OAUT] section 2.2.26
+        /// </summary>
+        public byte Sign { get; set; }
+
+        /// <summary>
+        /// The value of the Hi32 field specified in [MS-OAUT] section 2.2.26
+        /// </summary>
+        public uint Hi32 { get; set; }
+
+        /// <summary>
+        /// The value of the Lo64 field specified in [MS-OAUT] section 2.2.26
+        /// </summary>
+        public ulong Lo64 { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/Dictionary.cs
+++ b/SabreTools.Models/OLE/Dictionary.cs
@@ -0,0 +1,24 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The Dictionary packet represents all mappings between property identifiers and
+    /// property names in a property set
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class Dictionary
+    {
+        /// <summary>
+        /// n unsigned integer representing the number of entries in the Dictionary
+        /// </summary>
+        public uint NumEntries { get; set; }
+
+        /// <summary>
+        /// All Entry fields MUST be a sequence of DictionaryEntry packets. Entries are
+        /// not required to appear in any particular order.
+        /// </summary>
+        public DictionaryEntry[]? Entries { get; set; }
+
+        // Padding (variable): Padding, if necessary, to a total length that is a multiple of 4 bytes.
+        // Padding would be after each dictionary entry
+    }
+}
--- a/SabreTools.Models/OLE/DictionaryEntry.cs
+++ b/SabreTools.Models/OLE/DictionaryEntry.cs
@@ -0,0 +1,35 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The DictionaryEntry packet represents a mapping between a property identifier and a
+    /// property name
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class DictionaryEntry
+    {
+        /// <summary>
+        /// An unsigned integer representing a property identifier. MUST be a valid
+        /// PropertyIdentifier value in the range 0x00000002 to 0x7FFFFFFF, inclusive
+        /// (this specifically excludes the property identifiers for any of the special
+        /// properties specified in section 2.18).
+        /// </summary>
+        public PropertyIdentifier PropertyIdentifier { get; set; }
+
+        /// <summary>
+        /// If the property set's CodePage property has the value CP_WINUNICODE (0x04B0),
+        /// MUST be the length of the Name field in 16-bit Unicode characters, including
+        /// the null terminator but not including padding (if any). Otherwise, MUST be the
+        /// length of the Name field in 8-bit characters, including the null terminator.
+        /// </summary>
+        public uint Length { get; set; }
+
+        /// <summary>
+        /// If the property set's CodePage property has the value CP_WINUNICODE (0x04B0),
+        /// MUST be a null-terminated array of 16-bit Unicode characters, followed by zero
+        /// padding to a multiple of 4 bytes. Otherwise, MUST be a null-terminated array of
+        /// 8-bit characters from the code page identified by the CodePage property and MUST
+        /// NOT be padded.
+        /// </summary>
+        public string? Name { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/Enums.cs
+++ b/SabreTools.Models/OLE/Enums.cs
@@ -0,0 +1,503 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The PropertyIdentifier data type represents the property identifier of a property in a property set
+    /// </summary>
+    /// <remarks>
+    /// The SummaryInformation property set format, identified by FMTID_SummaryInformation
+    /// ({F29F85E0-4FF9-1068-AB91-08002B27B3D9}), represents generic properties of a document. The properties
+    /// specific to the SummaryInformation property set are specified in the following table. Except where
+    /// otherwise stated, a SummaryInformation property set SHOULD have all of these properties, and SHOULD
+    /// NOT have any other properties, except for the special properties specified in section 2.18.
+    /// </remarks>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public enum PropertyIdentifier : uint
+    {
+        /// <summary>
+        /// Property identifier for the Dictionary property
+        /// </summary>
+        DICTIONARY_PROPERTY_IDENTIFIER = 0x00000000,
+
+        /// <summary>
+        /// Property identifier for the CodePage property
+        /// </summary>
+        CODEPAGE_PROPERTY_IDENTIFIER = 0x00000001,
+
+        /// <summary>
+        /// Property identifier for the Locale property
+        /// </summary>
+        LOCALE_PROPERTY_IDENTIFIER = 0x80000000,
+
+        /// <summary>
+        /// Property identifier for the Behavior property
+        /// </summary>
+        BEHAVIOR_PROPERTY_IDENTIFIER = 0x80000003,
+
+        #region SummaryInformation
+
+        /// <summary>
+        /// The title of the document.
+        /// </summary>
+        /// <remarks>VT_LPSTR</remarks>
+        PIDSI_TITLE = 0x00000002,
+
+        /// <summary>
+        /// The subject of the document.
+        /// </summary>
+        /// <remarks>VT_LPSTR</remarks>
+        PIDSI_SUBJECT = 0x00000003,
+
+        /// <summary>
+        /// The author of the document.
+        /// </summary>
+        /// <remarks>VT_LPSTR</remarks>
+        PIDSI_AUTHOR = 0x00000004,
+
+        /// <summary>
+        /// Keywords related to the document.
+        /// </summary>
+        /// <remarks>VT_LPSTR</remarks>
+        PIDSI_KEYWORDS = 0x00000005,
+
+        /// <summary>
+        /// Comments related the document.
+        /// </summary>
+        /// <remarks>VT_LPSTR</remarks>
+        PIDSI_COMMENTS = 0x00000006,
+
+        /// <summary>
+        /// The application-specific template from which the document was created.
+        /// </summary>
+        /// <remarks>VT_LPSTR</remarks>
+        PIDSI_TEMPLATE = 0x00000007,
+
+        /// <summary>
+        /// The last author of the document.
+        /// </summary>
+        /// <remarks>VT_LPSTR</remarks>
+        PIDSI_LASTAUTHOR = 0x00000008,
+
+        /// <summary>
+        /// An application-specific revision number for this version of the document.
+        /// </summary>
+        /// <remarks>VT_LPSTR</remarks>
+        PIDSI_REVNUMBER = 0x00000009,
+
+        /// <summary>
+        /// A 64-bit unsigned integer indicating the total amount of time that
+        /// has been spent editing the document in 100-nanosecond
+        /// increments. MUST be encoded as a FILETIME by setting the
+        /// dwLowDataTime field to the low 32-bits and the dwHighDateTime
+        /// field to the high 32-bits.
+        /// </summary>
+        /// <remarks>VT_FILETIME</remarks>
+        PIDSI_EDITTIME = 0x0000000A,
+
+        /// <summary>
+        /// The most recent time that the document was printed.
+        /// </summary>
+        /// <remarks>VT_FILETIME</remarks>
+        PIDSI_LASTPRINTED = 0x0000000B,
+
+        /// <summary>
+        /// The time that the document was created.
+        /// </summary>
+        /// <remarks>VT_FILETIME</remarks>
+        PIDSI_CREATE_DTM = 0x0000000C,
+
+        /// <summary>
+        /// The most recent time that the document was saved.
+        /// </summary>
+        /// <remarks>VT_FILETIME</remarks>
+        PIDSI_LASTSAVE_DTM = 0x0000000D,
+
+        /// <summary>
+        /// The total number of pages in the document.
+        /// </summary>
+        /// <remarks>VT_I4</remarks>
+        PIDSI_PAGECOUNT = 0x0000000E,
+
+        /// <summary>
+        /// The total number of words in the document.
+        /// </summary>
+        /// <remarks>VT_I4</remarks>
+        PIDSI_WORDCOUNT = 0x0000000F,
+
+        /// <summary>
+        /// The total number of characters in the document.
+        /// </summary>
+        /// <remarks>VT_I4</remarks>
+        PIDSI_CHARCOUNT = 0x00000010,
+
+        /// <summary>
+        /// Application-specific clipboard data containing a thumbnail
+        /// representing the document's contents. MAY be absent.
+        /// </summary>
+        /// <remarks>VT_CF</remarks>
+        PIDSI_THUMBNAIL = 0x00000011,
+
+        /// <summary>
+        /// The name of the application that was used to create the document.
+        /// </summary>
+        /// <remarks>VT_LPSTR</remarks>
+        PIDSI_APPNAME = 0x00000012,
+
+        /// <summary>
+        /// A 32-bit signed integer representing a set of application-suggested
+        /// access control flags with the following values:
+        /// - 0x00000001: Password protected
+        /// - 0x00000002: Read-only recommended
+        /// - 0x00000004: Read-only enforced
+        /// - 0x00000008: Locked for annotations
+        /// </summary>
+        /// <remarks>VT_I4</remarks>
+        PIDSI_DOC_SECURITY = 0x00000013,
+
+        #endregion
+    }
+
+    /// <summary>
+    /// The PropertyType enumeration represents the type of a property in a property set. The set of types
+    /// supported depends on the version of the property set, which is indicated by the Version field of the
+    /// PropertySetStream packet. In addition, the property types not supported in simple property sets
+    /// are specified as such. PropertyType is an enumeration, which MUST be one of the following values
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public enum PropertyType : ushort
+    {
+        /// <summary>
+        /// Type is undefined, and the minimum property set version is 0
+        /// </summary>
+        VT_EMPTY = 0x0000,
+
+        /// <summary>
+        /// Type is null, and the minimum property set version is 0
+        /// </summary>
+        VT_NULL = 0x0001,
+
+        /// <summary>
+        /// Type is 16-bit signed integer, and the minimum property set version is 0
+        /// </summary>
+        VT_I2 = 0x0002,
+
+        /// <summary>
+        /// Type is 32-bit signed integer, and the minimum property set version is 0.
+        /// </summary>
+        VT_I4 = 0x0003,
+
+        /// <summary>
+        /// Type is 4-byte (single-precision) IEEE floating-point number, and the
+        /// minimum property set version is 0.
+        /// </summary>
+        VT_R4 = 0x0004,
+
+        /// <summary>
+        /// Type is 8-byte (double-precision) IEEE floating-point number, and the
+        /// minimum property set version is 0.
+        /// </summary>
+        VT_R8 = 0x0005,
+
+        /// <summary>
+        /// Type is CURRENCY, and the minimum property set version is 0.
+        /// </summary>
+        VT_CY = 0x0006,
+
+        /// <summary>
+        /// Type is DATE, and the minimum property set version is 0.
+        /// </summary>
+        VT_DATE = 0x0007,
+
+        /// <summary>
+        /// Type is CodePageString, and the minimum property set version is 0.
+        /// </summary>
+        VT_BSTR = 0x0008,
+
+        /// <summary>
+        /// Type is HRESULT, and the minimum property set version is 0.
+        /// </summary>
+        VT_ERROR = 0x000A,
+
+        /// <summary>
+        /// Type is VARIANT_BOOL, and the minimum property set version is 0.
+        /// </summary>
+        VT_BOOL = 0x000B,
+
+        /// <summary>
+        /// Type is DECIMAL, and the minimum property set version is 0.
+        /// </summary>
+        VT_DECIMAL = 0x000E,
+
+        /// <summary>
+        /// Type is 1-byte signed integer, and the minimum property set version
+        /// is 1.
+        /// </summary>
+        VT_I1 = 0x0010,
+
+        /// <summary>
+        /// Type is 1-byte unsigned integer, and the minimum property set version
+        /// is 0.
+        /// </summary>
+        VT_UI1 = 0x0011,
+
+        /// <summary>
+        /// Type is 2-byte unsigned integer, and the minimum property set version
+        /// is 0.
+        /// </summary>
+        VT_UI2 = 0x0012,
+
+        /// <summary>
+        /// Type is 4-byte unsigned integer, and the minimum property set version
+        /// is 0.
+        /// </summary>
+        VT_UI4 = 0x0013,
+
+        /// <summary>
+        ///  Type is 8-byte signed integer, and the minimum property set version
+        /// is 0.
+        /// </summary>
+        VT_I8 = 0x0014,
+
+        /// <summary>
+        /// Type is 8-byte unsigned integer, and the minimum property set version
+        /// is 0.
+        /// </summary>
+        VT_UI8 = 0x0015,
+
+        /// <summary>
+        /// Type is 4-byte signed integer, and the minimum property set version
+        /// is 1.
+        /// </summary>
+        VT_INT = 0x0016,
+
+        /// <summary>
+        /// Type is 4-byte unsigned integer, and the minimum property set version
+        /// is 1.
+        /// </summary>
+        VT_UINT = 0x0017,
+
+        /// <summary>
+        /// Type is CodePageString, and the minimum property set version is 0.
+        /// </summary>
+        VT_LPSTR = 0x001E,
+
+        /// <summary>
+        /// Type is UnicodeString, and the minimum property set version is 0.
+        /// </summary>
+        VT_LPWSTR = 0x001F,
+
+        /// <summary>
+        /// Type is FILETIME, and the minimum property set version is 0.
+        /// </summary>
+        VT_FILETIME = 0x0040,
+
+        /// <summary>
+        /// Type is binary large object (BLOB), and the minimum property set
+        /// version is 0.
+        /// </summary>
+        VT_BLOB = 0x0041,
+
+        /// <summary>
+        /// Type is Stream, and the minimum property set version is 0. VT_STREAM
+        /// is not allowed in a simple property set.
+        /// </summary>
+        VT_STREAM = 0x0042,
+
+        /// <summary>
+        /// Type is Storage, and the minimum property set version is 0. VT_STORAGE
+        /// is not allowed in a simple property set.
+        /// </summary>
+        VT_STORAGE = 0x0043,
+
+        /// <summary>
+        /// Type is Stream representing an Object in an application-specific manner,
+        /// and the minimum property set version is 0. VT_STREAMED_Object is not
+        /// allowed in a simple property set.
+        /// </summary>
+        VT_STREAMED_Object = 0x0044,
+
+        /// <summary>
+        /// Type is Storage representing an Object in an application-specific manner,
+        /// and the minimum property set version is 0. VT_STORED_Object is not
+        /// allowed in a simple property set.
+        /// </summary>
+        VT_STORED_Object = 0x0045,
+
+        /// <summary>
+        /// Type is BLOB representing an object in an application-specific manner.
+        /// The minimum property set version is 0.
+        /// </summary>
+        VT_BLOB_Object = 0x0046,
+
+        /// <summary>
+        /// Type is PropertyIdentifier, and the minimum property set version is 0.
+        /// </summary>
+        VT_CF = 0x0047,
+
+        /// <summary>
+        /// Type is CLSID, and the minimum property set version is 0.
+        /// </summary>
+        VT_CLSID = 0x0048,
+
+        /// <summary>
+        /// Type is Stream with application-specific version GUID (VersionedStream).
+        /// The minimum property set version is 0. VT_VERSIONED_STREAM is not allowed
+        /// in a simple property set.
+        /// </summary>
+        VT_VERSIONED_STREAM = 0x0049,
+
+        /// <summary>
+        /// Type is Vector, and the minimum property set version is 0
+        /// </summary>
+        VT_VECTOR = 0x1000,
+
+        /// <summary>
+        /// Type is Vector of 1-byte unsigned integers, and the minimum property set version
+        /// is 0.
+        /// </summary>
+        VT_VECTOR_UI1 = 0x1011,
+
+        /// <summary>
+        /// Type is Vector of 2-byte unsigned integers, and the minimum property set version
+        /// is 0.
+        /// </summary>
+        VT_VECTOR_UI2 = 0x1012,
+
+        /// <summary>
+        /// Type is Vector of 4-byte unsigned integers, and the minimum property set version
+        /// is 0.
+        /// </summary>
+        VT_VECTOR_UI4 = 0x1013,
+
+        /// <summary>
+        /// Type is Vector of 8-byte signed integers, and the minimum property set version
+        /// is 0.
+        /// </summary>
+        VT_VECTOR_I8 = 0x1014,
+
+        /// <summary>
+        /// Type is Vector of 8-byte unsigned integers and the minimum property set version
+        /// is 0.
+        /// </summary>
+        VT_VECTOR_UI8 = 0x1015,
+
+        /// <summary>
+        /// Type is Vector of CodePageString, and the minimum property set version is 0.
+        /// </summary>
+        VT_VECTOR_LPSTR = 0x101E,
+
+        /// <summary>
+        /// Type is Vector of UnicodeString, and the minimum property set version is 0.
+        /// </summary>
+        VT_VECTOR_LPWSTR = 0x101F,
+
+        /// <summary>
+        /// Type is Vector of FILETIME, and the minimum property set version is 0.
+        /// </summary>
+        VT_VECTOR_FILETIME = 0x1040,
+
+        /// <summary>
+        /// Type is Vector of PropertyIdentifier, and the minimum property set version is 0.
+        /// </summary>
+        VT_VECTOR_CF = 0x1047,
+
+        /// <summary>
+        /// Type is Vector of CLSID, and the minimum property set version is 0.
+        /// </summary>
+        VT_VECTOR_CLSID = 0x1048,
+
+        /// <summary>
+        /// Type is Array of 16-bit signed integers, and the minimum property set version
+        /// is 1.
+        /// </summary>
+        VT_ARRAY_I2 = 0x2002,
+
+        /// <summary>
+        /// Type is Array of 32-bit signed integers, and the minimum property set version
+        /// is 1.
+        /// </summary>
+        VT_ARRAY_I4 = 0x2003,
+
+        /// <summary>
+        /// Type is Array of 4-byte (single-precision) IEEE floating-point numbers, and the
+        /// minimum property set version is 1.
+        /// </summary>
+        VT_ARRAY_R4 = 0x2004,
+
+        /// <summary>
+        /// Type is IEEE floating-point numbers, and the minimum property set version is 1.
+        /// </summary>
+        VT_ARRAY_R8 = 0x2005,
+
+        /// <summary>
+        /// Type is Array of CURRENCY, and the minimum property set version is 1.
+        /// </summary>
+        VT_ARRAY_CY = 0x2006,
+
+        /// <summary>
+        /// Type is Array of DATE, and the minimum property set version is 1.
+        /// </summary>
+        VT_ARRAY_DATE = 0x2007,
+
+        /// <summary>
+        /// Type is Array of CodePageString, and the minimum property set version is 1.
+        /// </summary>
+        VT_ARRAY_BSTR = 0x2008,
+
+        /// <summary>
+        /// Type is Array of HRESULT, and the minimum property set version is 1.
+        /// </summary>
+        VT_ARRAY_ERROR = 0x200A,
+
+        /// <summary>
+        /// Type is Array of VARIANT_BOOL, and the minimum property set version is 1.
+        /// </summary>
+        VT_ARRAY_BOOL = 0x200B,
+
+        /// <summary>
+        /// Type is Array of variable-typed properties, and the minimum property set
+        /// version is 1
+        /// </summary>
+        VT_ARRAY_VARIANT = 0x200C,
+
+        /// <summary>
+        /// Type is Array of DECIMAL, and the minimum property set version is 1
+        /// </summary>
+        VT_ARRAY_DECIMAL = 0x200E,
+
+        /// <summary>
+        /// Type is Array of 1-byte signed integers, and the minimum property set
+        /// version is 1
+        /// </summary>
+        VT_ARRAY_I1 = 0x2010,
+
+        /// <summary>
+        /// Type is Array of 1-byte unsigned integers, and the minimum property set
+        /// version is 1
+        /// </summary>
+        VT_ARRAY_UI1 = 0x2011,
+
+        /// <summary>
+        /// Type is Array of 2-byte unsigned integers, and the minimum property set
+        /// version is 1.
+        /// </summary>
+        VT_ARRAY_UI2 = 0x2012,
+
+        /// <summary>
+        /// Type is Array of 4-byte unsigned integers, and the minimum property set
+        /// version is 1.
+        /// </summary>
+        VT_ARRAY_UI4 = 0x2013,
+
+        /// <summary>
+        /// Type is Array of 4-byte signed integers, and the minimum property set version
+        /// is 1.
+        /// </summary>
+        VT_ARRAY_INT = 0x2016,
+
+        /// <summary>
+        /// Type is Array of 4-byte unsigned integers, and the minimum property set version
+        /// is 1.
+        /// </summary>
+        VT_ARRAY_UINT = 0x2017,
+    }
+}
--- a/SabreTools.Models/OLE/FILETIME.cs
+++ b/SabreTools.Models/OLE/FILETIME.cs
@@ -0,0 +1,19 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The FILETIME (Packet Version) packet represents a FILETIME structure ([MS-DTYP] section 2.3.3
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class FILETIME
+    {
+        /// <summary>
+        /// The value of the dwLowDateTime field specified in [MS-DTYP] section 2.3.3.
+        /// </summary>
+        public uint LowDateTime { get; set; }
+
+        /// <summary>
+        /// The value of the dwHighDateTime field specified in [MS-DTYP] section 2.3.3.
+        /// </summary>
+        public uint HighDateTime { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/GUID.cs
+++ b/SabreTools.Models/OLE/GUID.cs
@@ -0,0 +1,29 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The GUID (Packet Version) packet represents a GUID
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class GUID
+    {
+        /// <summary>
+        /// The value of the Data1 field specified in [MS-DTYP] section 2.3.4
+        /// </summary>
+        public uint Data1 { get; set; }
+
+        /// <summary>
+        /// The value of the Data2 field specified in [MS-DTYP] section 2.3.4
+        /// </summary>
+        public ushort Data2 { get; set; }
+
+        /// <summary>
+        /// The value of the Data3 field specified in [MS-DTYP] section 2.3.4
+        /// </summary>
+        public ushort Data3 { get; set; }
+
+        /// <summary>
+        /// The value of the Data4 field specified in [MS-DTYP] section 2.3.4
+        /// </summary>
+        public byte[]? Data4 { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/IndirectPropertyName.cs
+++ b/SabreTools.Models/OLE/IndirectPropertyName.cs
@@ -0,0 +1,19 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The IndirectPropertyName packet represents the name of a stream or storage as used in the
+    /// representation of the following property types in a non-simple property set: VT_STREAM (0x0042),
+    /// VT_STORAGE (0x0043), VT_STREAMED_OBJECT (0x0044), VT_STORED_OBJECT (0x0044), and
+    /// VT_VERSIONED_STREAM (0x0049). It MUST be represented as a CodePageString, and its value MUST
+    /// be derived from the property identifier of the property represented according to the following
+    /// Augmented Backus–Naur Form (ABNF) [RFC4234] syntax.
+    ///
+    /// Indirectproperty = "prop" propertyIdentifier
+    /// 
+    /// Where PropertyIdentifier is the decimal string representation of the property identifier. This property
+    /// identifier MUST be a valid PropertyIdentifier value and MUST NOT be the property identifier for any of
+    /// the special properties specified in section 2.18.
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class IndirectPropertyName : CodePageString { }
+}
--- a/SabreTools.Models/OLE/PropertyIdentifierAndOffset.cs
+++ b/SabreTools.Models/OLE/PropertyIdentifierAndOffset.cs
@@ -0,0 +1,23 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The PropertyIdentifierAndOffset packet is used in the PropertySet packet to represent a
+    /// property identifier and the byte offset of the property in the PropertySet packet
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class PropertyIdentifierAndOffset
+    {
+        /// <summary>
+        /// An unsigned integer representing the property identifier of a property
+        /// in the property set. MUST be a valid PropertyIdentifier value.
+        /// </summary>
+        public PropertyIdentifier PropertyIdentifier { get; set; }
+
+        /// <summary>
+        /// An unsigned integer representing the offset in bytes from the beginning
+        /// of the PropertySet packet to the beginning of the Property field for the
+        /// property represented. MUST be a multiple of 4 bytes.
+        /// </summary>
+        public uint Offset { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/PropertySet.cs
+++ b/SabreTools.Models/OLE/PropertySet.cs
@@ -0,0 +1,36 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The PropertySet packet represents a property set.
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class PropertySet
+    {
+        /// <summary>
+        /// MUST be the total size in bytes of the PropertySet packet
+        /// </summary>
+        public uint Size { get; set; }
+
+        /// <summary>
+        /// An unsigned integer representing the number of properties in the
+        /// property set.
+        /// </summary>
+        public uint NumProperties { get; set; }
+
+        /// <summary>
+        /// All PropertyIdentifierAndOffset fields MUST be a sequence of
+        /// PropertyIdentifierAndOffset packets. The sequence MUST be in order of
+        /// increasing value of the Offset field. Packets are not required to be
+        /// in any particular order with regard to the value of the PropertyIdentifier
+        /// field.
+        /// </summary>
+        public PropertyIdentifierAndOffset[]? PropertyIdentifierAndOffsets { get; set; }
+
+        /// <summary>
+        /// Each Property field is a sequence of property values, each of which MUST
+        /// be represented by a TypedPropertyValue packet or a Dictionary packet in
+        /// the special case of the Dictionary property.
+        /// </summary>
+        public object[]? Properties { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/PropertySetStream.cs
+++ b/SabreTools.Models/OLE/PropertySetStream.cs
@@ -0,0 +1,106 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The PropertySetStream packet specifies the stream format for simple property
+    /// sets and the stream format for the CONTENTS stream in the Non-Simple Property
+    /// Set Storage Format. A simple property set MUST be represented by a stream
+    /// containing a PropertySetStream packet.
+    /// 
+    /// The PropertySetStream packet usually represents exactly one property set, but
+    /// for historical reasons, the DocumentSummaryInfo and UserDefinedProperties
+    /// property sets are represented in the same stream.In this special case, a
+    /// PropertySetStream might represent two property sets.
+    /// 
+    /// An implementation SHOULD enforce a limit on the total size of a PropertySetStream
+    /// packet. This limit MUST be at least 262,144 bytes, and for maximum interoperability
+    /// SHOULD be 2,097,152 bytes.
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class PropertySetStream
+    {
+        /// <summary>
+        /// MUST be set to 0xFFFE
+        /// </summary>
+        public ushort ByteOrder { get; set; }
+
+        /// <summary>
+        /// An unsigned integer indicating the version number of the property set (or
+        /// property sets). MUST be 0x0000 or 0x0001. An OLEPS implementation MUST
+        /// accept version 0 property sets and SHOULD<5> also accept version 1 property
+        /// sets. This field MUST be set to 0x0001 if the property set or property sets
+        /// use any of the following features not supported by version 0 property sets:
+        /// - Property types not supported for version 0 property sets, as specified in
+        ///   the PropertyType enumeration.
+        /// - The Behavior property.
+        /// 
+        /// If the property set does not use any of these features, this field SHOULD be
+        /// set to 0x0000 for maximum interoperability.
+        /// </summary>
+        public ushort Version { get; set; }
+
+        /// <summary>
+        /// An implementation-specific value that SHOULD be ignored, except possibly to
+        /// report this value to applications. It SHOULD NOT be interpreted by the
+        /// OLEPS implementation.
+        /// </summary>
+        public uint SystemIdentifier { get; set; }
+
+        /// <summary>
+        /// MUST be a GUID (Packet Version) packet representing the associated CLSID of
+        /// the property set (or property sets). If no CLSID is provided by the
+        /// application, it SHOULD be set to GUID_NULL by default.
+        /// </summary>
+        public GUID? CLSID { get; set; }
+
+        /// <summary>
+        /// An unsigned integer indicating the number of property sets represented by
+        /// this PropertySetStream structure. MUST be either 0x00000001 or 0x00000002.
+        /// 
+        /// - 0x00000001: This structure contains one property set
+        /// - 0x00000002: This structure contains two property sets.
+        ///               The optional fields for PropertySet 1 are present.
+        /// </summary>
+        public uint NumPropertySets { get; set; }
+
+        /// <summary>
+        /// A GUID that MUST be set to the FMTID of the property set represented by the
+        /// field PropertySet 0. If NumPropertySets has the value 0x00000002, then this
+        /// GUID MUST be set to FMTID_DocSummaryInformation
+        /// ({D5CDD502-2E9C-101B-9397-08002B2CF9AE}).
+        /// </summary>
+        public GUID? FMTID0 { get; set; }
+
+        /// <summary>
+        /// An unsigned integer that MUST be set to the offset in bytes from the beginning
+        /// of this PropertySetStream structure to the beginning of the field PropertySet 0.
+        /// </summary>
+        public uint Offset0 { get; set; }
+
+        /// <summary>
+        /// If NumPropertySets has the value 0x00000002, it MUST be set to FMTID_UserDefinedProperties
+        /// ({D5CDD505-2E9C-101B-9397-08002B2CF9AE}). Otherwise, it MUST be absent.
+        /// </summary>
+        public GUID? FMTID1 { get; set; }
+
+        /// <summary>
+        /// If NumPropertySets has the value 0x00000002, it MUST be set to the offset in bytes
+        /// from the beginning of this PropertySetStream structure to the beginning of the
+        /// field PropertySet 1. Otherwise, it MUST be absent.
+        /// </summary>
+        public uint? Offset1 { get; set; }
+
+        /// <summary>
+        /// MUST be a PropertySet packet
+        /// </summary>
+        public PropertySet? PropertySet0 { get; set; }
+
+        /// <summary>
+        /// If NumPropertySets has the value 0x00000002, it MUST be a PropertySet packet.
+        /// Otherwise, it MUST be absent.
+        /// </summary>
+        public PropertySet? PropertySet1 { get; set; }
+
+        // Padding (variable): Contains additional padding added by the implementation.
+        // If present, padding MUST be zeroes and MUST be ignored.
+    }
+}
--- a/SabreTools.Models/OLE/TypedPropertyValue.cs
+++ b/SabreTools.Models/OLE/TypedPropertyValue.cs
@@ -0,0 +1,27 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The TypedPropertyValue structure represents the typed value of a property in a property set
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class TypedPropertyValue
+    {
+        /// <summary>
+        /// MUST be a value from the PropertyType enumeration, indicating the type of
+        /// property represented.
+        /// </summary>
+        public PropertyType Type { get; set; }
+
+        /// <summary>
+        /// MUST be set to zero, and any nonzero value SHOULD be rejected
+        /// </summary>
+        public ushort Padding { get; set; }
+
+        /// <summary>
+        /// MUST be the value of the property represented and serialized according to
+        /// the value of Type as follows.
+        /// </summary>
+        /// <remarks>See documentation for required lengths</remarks>
+        public byte[]? Value { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/UnicodeString.cs
+++ b/SabreTools.Models/OLE/UnicodeString.cs
@@ -0,0 +1,23 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The UnicodeString packet represents a Unicode string.
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class UnicodeString
+    {
+        /// <summary>
+        /// The length in 16-bit Unicode characters of the <see cref="Characters"/> field, including the null
+        /// terminator, but not including padding (if any).
+        /// </summary>
+        public uint Length { get; set; }
+
+        /// <summary>
+        /// If <see cref="Length"/> is zero, this field MUST be zero bytes in length. If <see cref="Length"/> is
+        /// nonzero, this field MUST be a null-terminated array of 16-bit Unicode characters, followed by zero
+        /// padding to a multiple of 4 bytes. The string represented by this field SHOULD NOT contain
+        /// embedded or additional trailing null characters.
+        /// </summary>
+        public string? Characters { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/VectorHeader.cs
+++ b/SabreTools.Models/OLE/VectorHeader.cs
@@ -0,0 +1,14 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The VectorHeader packet represents the number of scalar values in a vector property type.
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class VectorHeader
+    {
+        /// <summary>
+        /// An unsigned integer indicating the number of scalar values following the header.
+        /// </summary>
+        public uint Length { get; set; }
+    }
+}
--- a/SabreTools.Models/OLE/VersionedStream.cs
+++ b/SabreTools.Models/OLE/VersionedStream.cs
@@ -0,0 +1,19 @@
+namespace SabreTools.Models.OLE
+{
+    /// <summary>
+    /// The VersionedStream packet represents a stream with an application-specific version GUID.
+    /// </summary>
+    /// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-OLEPS/%5bMS-OLEPS%5d.pdf"/> 
+    public class VersionedStream
+    {
+        /// <summary>
+        /// MUST be a GUID (Packet Version).
+        /// </summary>
+        public GUID? VersionGuid { get; set; }
+
+        /// <summary>
+        /// MUST be an IndirectPropertyName.
+        /// </summary>
+        public IndirectPropertyName? StreamName { get; set; }
+    }
+}
--- a/SabreTools.Models/PKZIP/AS400ExtraFieldAttribute.cs
+++ b/SabreTools.Models/PKZIP/AS400ExtraFieldAttribute.cs
@@ -23,4 +23,4 @@ namespace SabreTools.Models.PKZIP
        /// <remarks>Variable byte length based on field code</remarks>
        public byte[]? Data { get; set; }
    }
-}
+}
--- a/SabreTools.Models/PKZIP/AesEncryptionStructure.cs
+++ b/SabreTools.Models/PKZIP/AesEncryptionStructure.cs
@@ -0,0 +1,33 @@
+namespace SabreTools.Models.PKZIP
+{
+    /// <summary>
+    /// WinZip AES encryption data
+    /// </summary>
+    /// <remarks>Header ID = 0x9901</remarks>
+    /// <see href="https://github.com/adamhathcock/sharpcompress/blob/master/src/SharpCompress/Common/Zip/Headers/LocalEntryHeaderExtraFactory.cs"/> 
+    public class AesEncryptionStructure : ExtensibleDataField
+    {
+        /// <summary>
+        /// Compression type
+        /// </summary>
+        /// <remarks>Values 0f 0x01 and 0x02 are accepted</remarks>
+        public ushort CompressionType { get; set; }
+
+        /// <summary>
+        /// Vendor ID
+        /// </summary>
+        /// <remarks>Should be 0x4541</remarks>
+        public ushort VendorID { get; set; }
+
+        /// <summary>
+        /// Unknown
+        /// </summary>
+        /// <remarks>This value is unreferenced</remarks>
+        public byte Unknown { get; set; }
+
+        /// <summary>
+        /// Compression method
+        /// </summary>
+        public CompressionMethod CompressionMethod { get; set; }
+    }
+}
--- a/SabreTools.Models/PKZIP/Archive.cs
+++ b/SabreTools.Models/PKZIP/Archive.cs
@@ -6,36 +6,10 @@ namespace SabreTools.Models.PKZIP
    /// <remarks>PKZIP archives are meant to be read from the end</remarks>
    public class Archive
    {
-        #region Entries, Interleaved
-
        /// <summary>
-        /// Local file headers, always appear first in each group
+        /// Local file entries
        /// </summary>
-        public LocalFileHeader[]? LocalFileHeaders { get; set; }
-
-        /// <summary>
-        /// Encryption headers, may appear second in each group
-        /// </summary>
-        /// TODO: Determine the model for the encryption headers
-        public byte[][]? EncryptionHeaders { get; set; }
-
-        /// <summary>
-        /// File data, appears after the encryption header
-        /// if it exists or after the local file header otherwise
-        /// </summary>
-        public byte[][]? FileData { get; set; }
-
-        /// <summary>
-        /// Data descriptors, appears after the file data
-        /// </summary>
-        public DataDescriptor[]? DataDescriptors { get; set; }
-
-        /// <summary>
-        /// ZIP64 Data descriptors, appears after the file data
-        /// </summary>
-        public DataDescriptor64[]? ZIP64DataDescriptors { get; set; }
-
-        #endregion
+        public LocalFile[]? LocalFiles { get; set; }

        /// <summary>
        /// Optional archive decryption header, appears after all entries
@@ -69,4 +43,4 @@ namespace SabreTools.Models.PKZIP
        /// </summary>
        public EndOfCentralDirectoryRecord? EndOfCentralDirectoryRecord { get; set; }
    }
-}
+}
--- a/SabreTools.Models/PKZIP/ArchiveExtraDataRecord.cs
+++ b/SabreTools.Models/PKZIP/ArchiveExtraDataRecord.cs
@@ -21,4 +21,4 @@ namespace SabreTools.Models.PKZIP
        /// </summary>
        public byte[]? ExtraFieldData { get; set; }
    }
-}
+}
--- a/SabreTools.Models/PKZIP/CentralDirectoryFileHeader.cs
+++ b/SabreTools.Models/PKZIP/CentralDirectoryFileHeader.cs
@@ -109,11 +109,11 @@ namespace SabreTools.Models.PKZIP
        /// <summary>
        /// Extra field (variable size)
        /// </summary>
-        public byte[]? ExtraField { get; set; }
+        public ExtensibleDataField? ExtraField { get; set; }

        /// <summary>
        /// File comment (variable size)
        /// </summary>
        public string? FileComment { get; set; }
    }
-}
+}
--- a/SabreTools.Models/PKZIP/Constants.cs
+++ b/SabreTools.Models/PKZIP/Constants.cs
@@ -82,4 +82,4 @@ namespace SabreTools.Models.PKZIP

        #endregion
    }
-}
+}
--- a/SabreTools.Models/PKZIP/DataDescriptor.cs
+++ b/SabreTools.Models/PKZIP/DataDescriptor.cs
@@ -26,4 +26,4 @@ namespace SabreTools.Models.PKZIP
        /// </summary>
        public uint UncompressedSize { get; set; }
    }
-}
+}
--- a/SabreTools.Models/PKZIP/DataDescriptor64.cs
+++ b/SabreTools.Models/PKZIP/DataDescriptor64.cs
@@ -26,4 +26,4 @@ namespace SabreTools.Models.PKZIP
        /// </summary>
        public ulong UncompressedSize { get; set; }
    }
-}
+}
--- a/SabreTools.Models/PKZIP/DataStreamAlignment.cs
+++ b/SabreTools.Models/PKZIP/DataStreamAlignment.cs
@@ -31,4 +31,4 @@ namespace SabreTools.Models.PKZIP
        /// </summary>
        public byte[]? Padding { get; set; }
    }
-}
+}
--- a/SabreTools.Models/PKZIP/DigitalSignature.cs
+++ b/SabreTools.Models/PKZIP/DigitalSignature.cs
@@ -21,4 +21,4 @@ namespace SabreTools.Models.PKZIP
        /// </summary>
        public byte[]? SignatureData { get; set; }
    }
-}
+}
--- a/SabreTools.Models/PKZIP/EndOfCentralDirectoryLocator64.cs
+++ b/SabreTools.Models/PKZIP/EndOfCentralDirectoryLocator64.cs
@@ -29,4 +29,4 @@ namespace SabreTools.Models.PKZIP
        /// </summary>
        public uint TotalDisks;
    }
-}
+}
--- a/SabreTools.Models/PKZIP/EndOfCentralDirectoryRecord.cs
+++ b/SabreTools.Models/PKZIP/EndOfCentralDirectoryRecord.cs
@@ -76,4 +76,4 @@ namespace SabreTools.Models.PKZIP
        /// </summary>
        public string? FileComment { get; set; }
    }
-}
+}
--- a/SabreTools.Models/PKZIP/EndOfCentralDirectoryRecord64.cs
+++ b/SabreTools.Models/PKZIP/EndOfCentralDirectoryRecord64.cs
@@ -69,4 +69,4 @@ namespace SabreTools.Models.PKZIP
        /// </summary>
        public byte[]? ExtensibleDataSector { get; set; }
    }
-}
+}
--- a/SabreTools.Models/PKZIP/Enums.cs
+++ b/SabreTools.Models/PKZIP/Enums.cs
@@ -1,6 +1,7 @@
 using System;

 /// <see href="https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT"/> 
+/// <see href="https://github.com/adamhathcock/sharpcompress/blob/master/src/SharpCompress/Common/Zip/Headers/LocalEntryHeaderExtraFactory.cs"/> 
 namespace SabreTools.Models.PKZIP
 {
    [Flags]
@@ -1002,6 +1003,18 @@ namespace SabreTools.Models.PKZIP
        */
    }

+    [Flags]
+    public enum RecordedTimeFlag : byte
+    {
+        None = 0,
+
+        LastModified = 1,
+
+        LastAccessed = 2,
+
+        Created = 4,
+    }
+
    [Flags]
    public enum ZipItInternalSettings : ushort
    {
@@ -1805,4 +1818,4 @@ namespace SabreTools.Models.PKZIP
        /// </remarks>8 bytes  Big Endian</remarks>
        IBMCMPSCCompressionSize = 0x4102,
    }
-}
+}
--- a/SabreTools.Models/PKZIP/ExtendedTimestampExtraField.cs
+++ b/SabreTools.Models/PKZIP/ExtendedTimestampExtraField.cs
@@ -0,0 +1,33 @@
+namespace SabreTools.Models.PKZIP
+{
+    /// <summary>
+    /// The unix modified time, last access time, and creation time, if set
+    /// </summary>
+    /// <remarks>Header ID = 0x5455</remarks>
+    /// <see href="https://github.com/adamhathcock/sharpcompress/blob/master/src/SharpCompress/Common/Zip/Headers/LocalEntryHeaderExtraFactory.cs"/> 
+    public class ExtendedTimestampExtraField : ExtensibleDataField
+    {
+        /// <summary>
+        /// Indicates what tiemstamps are included
+        /// </summary>
+        public RecordedTimeFlag Flags { get; set; }
+
+        /// <summary>
+        /// Last modified time
+        /// </summary>
+        /// <remarks>Only available when <see cref="RecordedTimeFlag.LastModified"/> is set</remarks> 
+        public uint? LastModified { get; set; }
+
+        /// <summary>
+        /// Last accessed time
+        /// </summary>
+        /// <remarks>Only available when <see cref="RecordedTimeFlag.LastAccessed"/> is set</remarks> 
+        public uint? LastAccessed { get; set; }
+
+        /// <summary>
+        /// Created on time
+        /// </summary>
+        /// <remarks>Only available when <see cref="RecordedTimeFlag.Created"/> is set</remarks> 
+        public uint? CreatedOn { get; set; }
+    }
+}
--- a/SabreTools.Models/PKZIP/ExtensibleDataField.cs
+++ b/SabreTools.Models/PKZIP/ExtensibleDataField.cs
@@ -19,4 +19,4 @@ namespace SabreTools.Models.PKZIP
        /// </summary>
        public ushort DataSize { get; set; }
    }
-}
+}
--- a/SabreTools.Models/PKZIP/FWKCSMD5ExtraField.cs
+++ b/SabreTools.Models/PKZIP/FWKCSMD5ExtraField.cs
@@ -36,4 +36,4 @@ namespace SabreTools.Models.PKZIP
        /// <remarks>16 bytes</remarks>
        public byte[]? MD5 { get; set; }
    }
-}
+}
--- a/SabreTools.Models/PKZIP/InfoZIPUnicodeCommentExtraField.cs
+++ b/SabreTools.Models/PKZIP/InfoZIPUnicodeCommentExtraField.cs
@@ -51,4 +51,4 @@ namespace SabreTools.Models.PKZIP
        /// </summary>
        public string? UnicodeCom { get; set; }
    }
-}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matt Nadareski	81b53c9785	Bump version	2025-09-01 15:05:53 -04:00
Matt Nadareski	54c05f2746	Sync changes from downstream	2025-09-01 15:05:15 -04:00
Matt Nadareski	4a4d7ceddf	Make this more clear	2025-08-28 23:37:18 -04:00
Matt Nadareski	0f029c5979	Fix one	2025-08-28 21:29:23 -04:00
Matt Nadareski	bb4fee91d9	Sort some things around PE	2025-08-28 21:18:39 -04:00
Matt Nadareski	ed56e2543d	Convert this to an array	2025-08-28 12:12:04 -04:00
Matt Nadareski	d675673e50	More descriptive names	2025-08-28 09:47:01 -04:00
Matt Nadareski	ebee967c7f	Clean up gzip and tar a bit	2025-08-28 09:27:08 -04:00
Matt Nadareski	f5da54eaac	Fix some tar model issues	2025-08-28 08:56:11 -04:00
Matt Nadareski	2350c1af27	Add placeholder models	2025-08-28 07:46:23 -04:00
Matt Nadareski	454d507b41	Source my sources	2025-08-28 07:40:09 -04:00
Matt Nadareski	10de4acbb9	File ending thing for PKZIP	2025-08-28 07:38:11 -04:00
Matt Nadareski	8ec91d8d04	Add a couple missing extra field structures	2025-08-27 22:28:06 -04:00
Matt Nadareski	1d62d69a53	Interleaved types don't need to be here	2025-08-27 22:09:28 -04:00
Matt Nadareski	5b5fed8932	Rename a few things	2025-08-27 21:09:30 -04:00
Matt Nadareski	32123d4b80	Fix one more PKZIP extra field	2025-08-27 20:40:32 -04:00
Matt Nadareski	f5717c3929	Forgot to sync change here	2025-08-27 19:19:36 -04:00
Matt Nadareski	e8db261d73	Start making some fixes to PKZIP	2025-08-27 19:14:31 -04:00
Matt Nadareski	9557f43dab	Add placeholder extras field	2025-08-27 18:43:26 -04:00
Matt Nadareski	51b9c1a016	Make PKZIP models a bit easier to follow	2025-08-27 12:51:57 -04:00
Matt Nadareski	bb3cd54865	Remove now-useless note	2025-08-15 10:13:31 -04:00
Matt Nadareski	0c6060a901	Clickable sources, archive links for dead pages	2025-08-15 10:09:43 -04:00
Matt Nadareski	c18770f627	Upstream changes from WiseUnpacker	2025-08-15 08:59:29 -04:00
Matt Nadareski	c2a5d6770c	Upstream changes from WiseUnpacker	2025-08-13 12:22:11 -04:00
Matt Nadareski	4ef79ccdca	Upstream changes from WiseUnpacker	2025-08-10 21:44:23 -04:00
Matt Nadareski	cf5135f330	Slight NE cleanup	2025-08-10 20:36:53 -04:00
Matt Nadareski	6d989209db	Update NE notes and structure a bit more	2025-08-10 20:15:49 -04:00
Matt Nadareski	cc48593646	Upstream changes from WiseUnpacker	2025-08-09 10:26:37 -04:00
Matt Nadareski	415d571b65	Upstream changes from WiseUnpacker	2025-08-06 09:33:51 -04:00
Matt Nadareski	4a6e244b38	Upstream changes from WiseUnpacker	2025-08-04 12:16:34 -04:00
Matt Nadareski	771a39517f	Upstream changes from WiseUnpacker	2025-08-01 16:06:32 -04:00
Matt Nadareski	b072a3809c	Fix enum	2025-08-01 10:32:17 -04:00
Matt Nadareski	341585206a	Add Wise Installer models from REWise All credit to CYBERDEV for their work in documenting these structures in the first place	2025-07-31 22:35:04 -04:00
Matt Nadareski	2dc2ab5dd1	Add OLE models	2025-07-30 22:46:37 -04:00
Matt Nadareski	144a3ce52b	Fix CFB comments	2025-07-29 22:45:15 -04:00
Matt Nadareski	85199789f7	Add new Matroshka package comment	2025-07-28 07:54:29 -04:00
Matt Nadareski	fb39216c82	Bump verison	2025-07-24 09:11:34 -04:00
Matt Nadareski	1a2de39868	Fix Dir serialization issue	2025-07-24 09:11:10 -04:00
Matt Nadareski	f18b6c8850	Bump version	2025-07-23 09:48:18 -04:00
Matt Nadareski	8f1e49e464	Add .NET Standard 2.0 and 2.1	2025-07-23 09:43:12 -04:00
Matt Nadareski	6547242f93	Clean up more Matroskha comments	2025-07-21 11:27:20 -04:00
Matt Nadareski	edf00f3ab2	Add analysis block comment	2025-07-21 11:25:18 -04:00
Matt Nadareski	bce4736037	Clean up more Matroskha comments	2025-07-21 11:23:25 -04:00
Matt Nadareski	81f28974c0	More remark corrections based on more samples	2025-07-21 11:10:35 -04:00
Matt Nadareski	30ebe84af4	Remove disproven theory	2025-07-21 11:08:01 -04:00
Matt Nadareski	b07fbdedd6	Add secondary length note	2025-07-21 09:39:31 -04:00
Matt Nadareski	cd8fff4a86	Slight tweaks to Matroska entry notes	2025-07-21 09:21:56 -04:00
Matt Nadareski	3d3275e3cb	Add SecuROM Matroshka models All research thanks to HeroponRikiBestest	2025-07-21 09:11:37 -04:00
Matt Nadareski	4c76ce1230	Add SecuROM DFA models All research thanks to HeroponRikiBestest	2025-07-21 08:10:25 -04:00
Matt Nadareski	0c4e3b4bf2	Dirs can be nested	2025-06-24 12:32:14 -04:00
Matt Nadareski	e8f4386199	Add mess alternative ListXML model	2025-05-28 09:53:05 -04:00
Matt Nadareski	ab66ccf3c5	Update copyright	2024-12-30 21:19:05 -05:00
Matt Nadareski	cc60d54a33	Remove unnecessary action step	2024-12-30 21:18:59 -05:00
Matt Nadareski	e805f4cb9a	Ensure .NET versions are installed for testing	2024-12-19 10:50:01 -05:00
Matt Nadareski	328c893a38	Ensure .NET versions are installed for testing	2024-12-19 10:45:08 -05:00
Matt Nadareski	ab2a12c996	Bump version	2024-12-16 12:10:13 -05:00
Matt Nadareski	362b123661	Allow symbols to be packed	2024-12-16 11:37:18 -05:00
Matt Nadareski	4a8a4746a2	Add big-endian note for PS4 PKG	2024-12-16 11:31:38 -05:00
Deterous	3f368a3be8	Create model for PS4 app.pkg header (#7 ) * Create model for PS4 app.pkg header * Rename PS4 app.pkg class * Fix typo * Requested changes * Add newline	2024-12-15 20:12:06 -05:00
Matt Nadareski	2749c2f5bd	Bump version	2024-12-11 11:25:41 -05:00
Matt Nadareski	41ce962700	Reorder LZ constants	2024-12-11 11:10:01 -05:00
Matt Nadareski	85b7103bd3	Re-rename Expand to SZDD for consistency	2024-12-11 11:09:28 -05:00
Matt Nadareski	4c61a191e8	Remove MS-ZIP Block type	2024-12-11 11:00:44 -05:00
Matt Nadareski	0f70598969	Add LZ prefixes for easier checking	2024-12-11 10:58:47 -05:00
Matt Nadareski	d6b057d808	Move LZ models out of Compression namespace	2024-12-11 10:54:10 -05:00
Matt Nadareski	3d8036e7b5	Remove things that Compression doesn't need anymore	2024-12-11 10:46:28 -05:00
Matt Nadareski	bb35946866	Ensure KWAJ header flags serialized	2024-12-11 04:19:02 -05:00
Matt Nadareski	78f9f1b36f	Fix KWAJ serialization	2024-12-11 04:16:23 -05:00
Matt Nadareski	9d1b1ca36d	Further simplify LZ models	2024-12-11 03:48:10 -05:00
Matt Nadareski	6e1f8bf55e	Fix issues with MS-LZ models	2024-12-11 01:50:02 -05:00
Matt Nadareski	a19afc240c	Bump version	2024-12-10 15:28:49 -05:00
Matt Nadareski	148e97ef64	Add now-supported DOSCenter SHA-1 attribute	2024-12-07 23:28:52 -05:00
Matt Nadareski	676b446025	Add badge for build status	2024-12-06 10:48:43 -05:00
Matt Nadareski	aeff75d8d3	Rename workflow file, add releases to README	2024-12-06 10:47:42 -05:00
Matt Nadareski	e20e515f56	Attempt to use publish script	2024-12-06 10:43:08 -05:00