diff --git a/SabreTools.Models/AACS/DriveRevocationListRecord.cs b/SabreTools.Models/AACS/DriveRevocationListRecord.cs
index 29cef06..f4bb740 100644
--- a/SabreTools.Models/AACS/DriveRevocationListRecord.cs
+++ b/SabreTools.Models/AACS/DriveRevocationListRecord.cs
@@ -21,6 +21,6 @@ namespace SabreTools.Models.AACS
         /// <summary>
         /// Revocation list entries
         /// </summary>
-        public DriveRevocationSignatureBlock?[]? SignatureBlocks { get; set; }
+        public DriveRevocationSignatureBlock[]? SignatureBlocks { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Models/AACS/DriveRevocationSignatureBlock.cs b/SabreTools.Models/AACS/DriveRevocationSignatureBlock.cs
index 5ad379d..25c8e88 100644
--- a/SabreTools.Models/AACS/DriveRevocationSignatureBlock.cs
+++ b/SabreTools.Models/AACS/DriveRevocationSignatureBlock.cs
@@ -12,6 +12,6 @@ namespace SabreTools.Models.AACS
         /// A list of 8-byte Host Drive List Entry fields, the length of this
         /// list being equal to the number in the signature block.
         /// </summary>
-        public DriveRevocationListEntry?[]? EntryFields { get; set; }
+        public DriveRevocationListEntry[]? EntryFields { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Models/AACS/ExplicitSubsetDifferenceRecord.cs b/SabreTools.Models/AACS/ExplicitSubsetDifferenceRecord.cs
index c70b6d6..53a31ca 100644
--- a/SabreTools.Models/AACS/ExplicitSubsetDifferenceRecord.cs
+++ b/SabreTools.Models/AACS/ExplicitSubsetDifferenceRecord.cs
@@ -6,6 +6,6 @@ namespace SabreTools.Models.AACS
         /// <summary>
         /// In this record, each subset-difference is encoded with 5 bytes.
         /// </summary>
-        public SubsetDifference?[]? SubsetDifferences { get; set; }
+        public SubsetDifference[]? SubsetDifferences { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Models/AACS/HostRevocationListRecord.cs b/SabreTools.Models/AACS/HostRevocationListRecord.cs
index 8900839..4647551 100644
--- a/SabreTools.Models/AACS/HostRevocationListRecord.cs
+++ b/SabreTools.Models/AACS/HostRevocationListRecord.cs
@@ -24,6 +24,6 @@ namespace SabreTools.Models.AACS
         /// <summary>
         /// Revocation list entries
         /// </summary>
-        public HostRevocationSignatureBlock?[]? SignatureBlocks { get; set; }
+        public HostRevocationSignatureBlock[]? SignatureBlocks { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Models/AACS/HostRevocationSignatureBlock.cs b/SabreTools.Models/AACS/HostRevocationSignatureBlock.cs
index ae0ed45..227317e 100644
--- a/SabreTools.Models/AACS/HostRevocationSignatureBlock.cs
+++ b/SabreTools.Models/AACS/HostRevocationSignatureBlock.cs
@@ -12,6 +12,6 @@ namespace SabreTools.Models.AACS
         /// A list of 8-byte Host Revocation List Entry fields, the length of this
         /// list being equal to the number in the signature block.
         /// </summary>
-        public HostRevocationListEntry?[]? EntryFields { get; set; }
+        public HostRevocationListEntry[]? EntryFields { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Models/AACS/MediaKeyBlock.cs b/SabreTools.Models/AACS/MediaKeyBlock.cs
index ae99bed..17f3f94 100644
--- a/SabreTools.Models/AACS/MediaKeyBlock.cs
+++ b/SabreTools.Models/AACS/MediaKeyBlock.cs
@@ -9,6 +9,6 @@ namespace SabreTools.Models.AACS
         /// <summary>
         /// Records
         /// </summary>
-        public Record?[]? Records { get; set; }
+        public Record[]? Records { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Models/ArchiveDotOrg/Files.cs b/SabreTools.Models/ArchiveDotOrg/Files.cs
index d6dce58..124afa1 100644
--- a/SabreTools.Models/ArchiveDotOrg/Files.cs
+++ b/SabreTools.Models/ArchiveDotOrg/Files.cs
@@ -7,6 +7,6 @@ namespace SabreTools.Models.ArchiveDotOrg
     public class Files
     {
         [XmlElement("file")]
-        public File?[]? File { get; set; }
+        public File[]? File { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Models/AttractMode/MetadataFile.cs b/SabreTools.Models/AttractMode/MetadataFile.cs
index 5baf76f..b1b78a0 100644
--- a/SabreTools.Models/AttractMode/MetadataFile.cs
+++ b/SabreTools.Models/AttractMode/MetadataFile.cs
@@ -8,6 +8,6 @@ namespace SabreTools.Models.AttractMode
         [Required]
         public string[]? Header { get; set; }
 
-        public Row?[]? Row { get; set; }
+        public Row[]? Row { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Models/ClrMamePro/MetadataFile.cs b/SabreTools.Models/ClrMamePro/MetadataFile.cs
index 6907635..3991a97 100644
--- a/SabreTools.Models/ClrMamePro/MetadataFile.cs
+++ b/SabreTools.Models/ClrMamePro/MetadataFile.cs
@@ -6,6 +6,6 @@ namespace SabreTools.Models.ClrMamePro
         public ClrMamePro? ClrMamePro { get; set; }
 
         /// <remarks>game, machine, resource, set</remarks>
-        public GameBase?[]? Game { get; set; }
+        public GameBase[]? Game { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Models/Compression/Quantum/Model.cs b/SabreTools.Models/Compression/Quantum/Model.cs
index 31100b4..fb21617 100644
--- a/SabreTools.Models/Compression/Quantum/Model.cs
+++ b/SabreTools.Models/Compression/Quantum/Model.cs
@@ -10,7 +10,7 @@ namespace SabreTools.Models.Compression.Quantum
         /// order in the table, and with every symbol in the table
         /// having a frequency of 1
         /// </remarks>
-        public ModelSymbol?[]? Symbols { get; set; }
+        public ModelSymbol[]? Symbols { get; set; }
 
         /// <remarks>
         /// The initial total frequency is equal to the number of entries
diff --git a/SabreTools.Models/CueSheets/CueFile.cs b/SabreTools.Models/CueSheets/CueFile.cs
index ecb94ec..136552a 100644
--- a/SabreTools.Models/CueSheets/CueFile.cs
+++ b/SabreTools.Models/CueSheets/CueFile.cs
@@ -25,6 +25,6 @@ namespace SabreTools.Models.CueSheets
         /// <summary>
         /// List of TRACK in FILE
         /// </summary>
-        public CueTrack?[]? Tracks { get; set; }
+        public CueTrack[]? Tracks { get; set; }
     }
 }
diff --git a/SabreTools.Models/CueSheets/CueSheet.cs b/SabreTools.Models/CueSheets/CueSheet.cs
index 0e82385..916ae1a 100644
--- a/SabreTools.Models/CueSheets/CueSheet.cs
+++ b/SabreTools.Models/CueSheets/CueSheet.cs
@@ -36,6 +36,6 @@ namespace SabreTools.Models.CueSheets
         /// <summary>
         /// List of FILE in cuesheet
         /// </summary>
-        public CueFile?[]? Files { get; set; }
+        public CueFile[]? Files { get; set; }
     }
 }
diff --git a/SabreTools.Models/CueSheets/CueTrack.cs b/SabreTools.Models/CueSheets/CueTrack.cs
index 9956afe..e451887 100644
--- a/SabreTools.Models/CueSheets/CueTrack.cs
+++ b/SabreTools.Models/CueSheets/CueTrack.cs
@@ -53,7 +53,7 @@ namespace SabreTools.Models.CueSheets
         /// List of INDEX in TRACK
         /// </summary>
         /// <remarks>Must start with 0 or 1 and then sequential</remarks>
-        public CueIndex?[]? Indices { get; set; }
+        public CueIndex[]? Indices { get; set; }
 
         /// <summary>
         /// POSTGAP
diff --git a/SabreTools.Models/GCF/File.cs b/SabreTools.Models/GCF/File.cs
index 387f7e6..c1aa683 100644
--- a/SabreTools.Models/GCF/File.cs
+++ b/SabreTools.Models/GCF/File.cs
@@ -21,7 +21,7 @@ namespace SabreTools.Models.GCF
         /// <summary>
         /// Block entries data
         /// </summary>
-        public BlockEntry?[]? BlockEntries { get; set; }
+        public BlockEntry[]? BlockEntries { get; set; }
 
         /// <summary>
         /// Fragmentation map header data
@@ -31,7 +31,7 @@ namespace SabreTools.Models.GCF
         /// <summary>
         /// Fragmentation map data
         /// </summary>
-        public FragmentationMap?[]? FragmentationMaps { get; set; }
+        public FragmentationMap[]? FragmentationMaps { get; set; }
 
         /// <summary>
         /// Block entry map header data
@@ -43,7 +43,7 @@ namespace SabreTools.Models.GCF
         /// Block entry map data
         /// </summary>
         /// <remarks>Part of version 5 but not version 6.</remarks>
-        public BlockEntryMap?[]? BlockEntryMaps { get; set; }
+        public BlockEntryMap[]? BlockEntryMaps { get; set; }
 
         /// <summary>
         /// Directory header data
@@ -53,7 +53,7 @@ namespace SabreTools.Models.GCF
         /// <summary>
         /// Directory entries data
         /// </summary>
-        public DirectoryEntry?[]? DirectoryEntries { get; set; }
+        public DirectoryEntry[]? DirectoryEntries { get; set; }
 
         /// <summary>
         /// Directory names data
@@ -63,22 +63,22 @@ namespace SabreTools.Models.GCF
         /// <summary>
         /// Directory info 1 entries data
         /// </summary>
-        public DirectoryInfo1Entry?[]? DirectoryInfo1Entries { get; set; }
+        public DirectoryInfo1Entry[]? DirectoryInfo1Entries { get; set; }
 
         /// <summary>
         /// Directory info 2 entries data
         /// </summary>
-        public DirectoryInfo2Entry?[]? DirectoryInfo2Entries { get; set; }
+        public DirectoryInfo2Entry[]? DirectoryInfo2Entries { get; set; }
 
         /// <summary>
         /// Directory copy entries data
         /// </summary>
-        public DirectoryCopyEntry?[]? DirectoryCopyEntries { get; set; }
+        public DirectoryCopyEntry[]? DirectoryCopyEntries { get; set; }
 
         /// <summary>
         /// Directory local entries data
         /// </summary>
-        public DirectoryLocalEntry?[]? DirectoryLocalEntries { get; set; }
+        public DirectoryLocalEntry[]? DirectoryLocalEntries { get; set; }
 
         /// <summary>
         /// Directory map header data
@@ -88,7 +88,7 @@ namespace SabreTools.Models.GCF
         /// <summary>
         /// Directory map entries data
         /// </summary>
-        public DirectoryMapEntry?[]? DirectoryMapEntries { get; set; }
+        public DirectoryMapEntry[]? DirectoryMapEntries { get; set; }
 
         /// <summary>
         /// Checksum header data
@@ -103,12 +103,12 @@ namespace SabreTools.Models.GCF
         /// <summary>
         /// Checksum map entries data
         /// </summary>
-        public ChecksumMapEntry?[]? ChecksumMapEntries { get; set; }
+        public ChecksumMapEntry[]? ChecksumMapEntries { get; set; }
 
         /// <summary>
         /// Checksum entries data
         /// </summary>
-        public ChecksumEntry?[]? ChecksumEntries { get; set; }
+        public ChecksumEntry[]? ChecksumEntries { get; set; }
 
         /// <summary>
         /// Data block header data
diff --git a/SabreTools.Models/InstallShieldCabinet/Cabinet.cs b/SabreTools.Models/InstallShieldCabinet/Cabinet.cs
index f4df0d4..20824d9 100644
--- a/SabreTools.Models/InstallShieldCabinet/Cabinet.cs
+++ b/SabreTools.Models/InstallShieldCabinet/Cabinet.cs
@@ -40,7 +40,7 @@ namespace SabreTools.Models.InstallShieldCabinet
         /// <summary>
         /// Standard file descriptors
         /// </summary>
-        public FileDescriptor?[]? FileDescriptors { get; set; }
+        public FileDescriptor[]? FileDescriptors { get; set; }
 
         #endregion
 
@@ -54,7 +54,7 @@ namespace SabreTools.Models.InstallShieldCabinet
         /// <summary>
         /// File groups
         /// </summary>
-        public FileGroup?[]? FileGroups { get; set; }
+        public FileGroup[]? FileGroups { get; set; }
 
         #endregion
 
@@ -68,7 +68,7 @@ namespace SabreTools.Models.InstallShieldCabinet
         /// <summary>
         /// Components
         /// </summary>
-        public Component?[]? Components { get; set; }
+        public Component[]? Components { get; set; }
 
         #endregion
     }
diff --git a/SabreTools.Models/LinearExecutable/EntryTableBundle.cs b/SabreTools.Models/LinearExecutable/EntryTableBundle.cs
index 363d01e..fb25bf8 100644
--- a/SabreTools.Models/LinearExecutable/EntryTableBundle.cs
+++ b/SabreTools.Models/LinearExecutable/EntryTableBundle.cs
@@ -51,6 +51,6 @@
         /// <summary>
         /// Table entries in the bundle
         /// </summary>
-        public EntryTableEntry?[]? TableEntries { get; set; }
+        public EntryTableEntry[]? TableEntries { get; set; }
     }
 }
diff --git a/SabreTools.Models/LinearExecutable/Executable.cs b/SabreTools.Models/LinearExecutable/Executable.cs
index 60073fa..8b52a00 100644
--- a/SabreTools.Models/LinearExecutable/Executable.cs
+++ b/SabreTools.Models/LinearExecutable/Executable.cs
@@ -23,69 +23,69 @@ namespace SabreTools.Models.LinearExecutable
         /// <summary>
         /// Object table
         /// </summary>
-        public ObjectTableEntry?[]? ObjectTable { get; set; }
+        public ObjectTableEntry[]? ObjectTable { get; set; }
 
         /// <summary>
         /// Object page map
         /// </summary>
-        public ObjectPageMapEntry?[]? ObjectPageMap { get; set; }
+        public ObjectPageMapEntry[]? ObjectPageMap { get; set; }
 
         // TODO: Object iterate data map table (Undefined)
 
         /// <summary>
         /// Resource table
         /// </summary>
-        public ResourceTableEntry?[]? ResourceTable { get; set; }
+        public ResourceTableEntry[]? ResourceTable { get; set; }
 
         /// <summary>
         /// Resident Name table
         /// </summary>
-        public ResidentNamesTableEntry?[]? ResidentNamesTable { get; set; }
+        public ResidentNamesTableEntry[]? ResidentNamesTable { get; set; }
 
         /// <summary>
         /// Entry table
         /// </summary>
-        public EntryTableBundle?[]? EntryTable { get; set; }
+        public EntryTableBundle[]? EntryTable { get; set; }
 
         /// <summary>
         /// Module format directives table (optional)
         /// </summary>
-        public ModuleFormatDirectivesTableEntry?[]? ModuleFormatDirectivesTable { get; set; }
+        public ModuleFormatDirectivesTableEntry[]? ModuleFormatDirectivesTable { get; set; }
 
         /// <summary>
         /// Verify record directive table (optional)
         /// </summary>
-        public VerifyRecordDirectiveTableEntry?[]? VerifyRecordDirectiveTable { get; set; }
+        public VerifyRecordDirectiveTableEntry[]? VerifyRecordDirectiveTable { get; set; }
 
         /// <summary>
         /// Fix-up page table
         /// </summary>
-        public FixupPageTableEntry?[]? FixupPageTable { get; set; }
+        public FixupPageTableEntry[]? FixupPageTable { get; set; }
 
         /// <summary>
         /// Fix-up record table
         /// </summary>
-        public FixupRecordTableEntry?[]? FixupRecordTable { get; set; }
+        public FixupRecordTableEntry[]? FixupRecordTable { get; set; }
 
         /// <summary>
         /// Import module name table
         /// </summary>
-        public ImportModuleNameTableEntry?[]? ImportModuleNameTable { get; set; }
+        public ImportModuleNameTableEntry[]? ImportModuleNameTable { get; set; }
 
         /// <summary>
         /// Import procedure name table
         /// </summary>
-        public ImportModuleProcedureNameTableEntry?[]? ImportModuleProcedureNameTable { get; set; }
+        public ImportModuleProcedureNameTableEntry[]? ImportModuleProcedureNameTable { get; set; }
 
         /// <summary>
         /// Per-Page checksum table
         /// </summary>
-        public PerPageChecksumTableEntry?[]? PerPageChecksumTable { get; set; }
+        public PerPageChecksumTableEntry[]? PerPageChecksumTable { get; set; }
 
         /// <summary>
         /// Non-Resident Name table
         /// </summary>
-        public NonResidentNamesTableEntry?[]? NonResidentNamesTable { get; set; }
+        public NonResidentNamesTableEntry[]? NonResidentNamesTable { get; set; }
 
         // TODO: Non-resident directives data (Undefined)
 
diff --git a/SabreTools.Models/MSDOS/Executable.cs b/SabreTools.Models/MSDOS/Executable.cs
index 90d6008..ab7260c 100644
--- a/SabreTools.Models/MSDOS/Executable.cs
+++ b/SabreTools.Models/MSDOS/Executable.cs
@@ -24,6 +24,6 @@ namespace SabreTools.Models.MSDOS
         /// make the loader add start segment address to the value at offset
         /// 1*0x10+0x1A=0x2A within the program data.
         /// </summary>
-        public RelocationEntry?[]? RelocationTable { get; set; }
+        public RelocationEntry[]? RelocationTable { get; set; }
     }
 }
diff --git a/SabreTools.Models/MicrosoftCabinet/CFFOLDER.cs b/SabreTools.Models/MicrosoftCabinet/CFFOLDER.cs
index d164b28..269ec09 100644
--- a/SabreTools.Models/MicrosoftCabinet/CFFOLDER.cs
+++ b/SabreTools.Models/MicrosoftCabinet/CFFOLDER.cs
@@ -51,6 +51,6 @@
         /// <summary>
         /// Data blocks associated with this folder
         /// </summary>
-        public CFDATA?[]? DataBlocks { get; set; }
+        public CFDATA[]? DataBlocks { get; set; }
     }
 }
diff --git a/SabreTools.Models/MicrosoftCabinet/Cabinet.cs b/SabreTools.Models/MicrosoftCabinet/Cabinet.cs
index 54f2d1e..da64e67 100644
--- a/SabreTools.Models/MicrosoftCabinet/Cabinet.cs
+++ b/SabreTools.Models/MicrosoftCabinet/Cabinet.cs
@@ -17,11 +17,11 @@
         /// <summary>
         /// One or more CFFOLDER entries
         /// </summary>
-        public CFFOLDER?[]? Folders { get; set; }
+        public CFFOLDER[]? Folders { get; set; }
 
         /// <summary>
         /// A series of one or more cabinet file (CFFILE) entries
         /// </summary>
-        public CFFILE?[]? Files { get; set; }
+        public CFFILE[]? Files { get; set; }
     }
 }
diff --git a/SabreTools.Models/MoPaQ/Archive.cs b/SabreTools.Models/MoPaQ/Archive.cs
index f4edee6..fc59fca 100644
--- a/SabreTools.Models/MoPaQ/Archive.cs
+++ b/SabreTools.Models/MoPaQ/Archive.cs
@@ -37,12 +37,12 @@
         /// <summary>
         /// Hash Table (optional)
         /// </summary>
-        public HashEntry?[]? HashTable { get; set; }
+        public HashEntry[]? HashTable { get; set; }
 
         /// <summary>
         /// Block Table (optional)
         /// </summary>
-        public BlockEntry?[]? BlockTable { get; set; }
+        public BlockEntry[]? BlockTable { get; set; }
 
         /// <summary>
         /// Hi-Block Table (optional)
diff --git a/SabreTools.Models/N3DS/CIA.cs b/SabreTools.Models/N3DS/CIA.cs
index aecfeef..b060897 100644
--- a/SabreTools.Models/N3DS/CIA.cs
+++ b/SabreTools.Models/N3DS/CIA.cs
@@ -25,7 +25,7 @@ namespace SabreTools.Models.N3DS
         /// <remarks>
         /// https://www.3dbrew.org/wiki/CIA#Certificate_Chain
         /// </remarks>
-        public Certificate?[]? CertificateChain { get; set; }
+        public Certificate[]? CertificateChain { get; set; }
 
         /// <summary>
         /// Ticket
@@ -40,7 +40,7 @@ namespace SabreTools.Models.N3DS
         /// <summary>
         /// Content file data
         /// </summary>
-        public NCCHHeader?[]? Partitions { get; set; }
+        public NCCHHeader[]? Partitions { get; set; }
 
         /// <summary>
         /// Content file data
diff --git a/SabreTools.Models/N3DS/Cart.cs b/SabreTools.Models/N3DS/Cart.cs
index f7193fd..688f9b6 100644
--- a/SabreTools.Models/N3DS/Cart.cs
+++ b/SabreTools.Models/N3DS/Cart.cs
@@ -23,21 +23,21 @@ namespace SabreTools.Models.N3DS
         /// <summary>
         /// NCCH partitions
         /// </summary>
-        public NCCHHeader?[]? Partitions { get; set; }
+        public NCCHHeader[]? Partitions { get; set; }
 
         /// <summary>
         /// NCCH extended headers
         /// </summary>
-        public NCCHExtendedHeader?[]? ExtendedHeaders { get; set; }
+        public NCCHExtendedHeader[]? ExtendedHeaders { get; set; }
 
         /// <summary>
         /// ExeFS headers associated with each partition
         /// </summary>
-        public ExeFSHeader?[]? ExeFSHeaders { get; set; }
+        public ExeFSHeader[]? ExeFSHeaders { get; set; }
 
         /// <summary>
         /// RomFS headers associated with each partition
         /// </summary>
-        public RomFSHeader?[]? RomFSHeaders { get; set; }
+        public RomFSHeader[]? RomFSHeaders { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Models/N3DS/ExeFSHeader.cs b/SabreTools.Models/N3DS/ExeFSHeader.cs
index 98b3714..feb047d 100644
--- a/SabreTools.Models/N3DS/ExeFSHeader.cs
+++ b/SabreTools.Models/N3DS/ExeFSHeader.cs
@@ -16,7 +16,7 @@
         /// <summary>
         /// File headers (10 headers maximum, 16 bytes each)
         /// </summary>
-        public ExeFSFileHeader?[]? FileHeaders { get; set; }
+        public ExeFSFileHeader[]? FileHeaders { get; set; }
 
         /// <summary>
         /// Reserved
diff --git a/SabreTools.Models/N3DS/NCSDHeader.cs b/SabreTools.Models/N3DS/NCSDHeader.cs
index 6bc825a..302cdf4 100644
--- a/SabreTools.Models/N3DS/NCSDHeader.cs
+++ b/SabreTools.Models/N3DS/NCSDHeader.cs
@@ -46,7 +46,7 @@
         /// <summary>
         /// Offset & Length partition table, in media units
         /// </summary>
-        public PartitionTableEntry?[]? PartitionsTable { get; set; }
+        public PartitionTableEntry[]? PartitionsTable { get; set; }
 
         #endregion
 
diff --git a/SabreTools.Models/N3DS/Ticket.cs b/SabreTools.Models/N3DS/Ticket.cs
index 5e12a98..2bc3df4 100644
--- a/SabreTools.Models/N3DS/Ticket.cs
+++ b/SabreTools.Models/N3DS/Ticket.cs
@@ -173,6 +173,6 @@ namespace SabreTools.Models.N3DS
         /// <remarks>
         /// https://www.3dbrew.org/wiki/Ticket#Certificate_Chain
         /// </remarks>
-        public Certificate?[]? CertificateChain { get; set; }
+        public Certificate[]? CertificateChain { get; set; }
     }
 }
diff --git a/SabreTools.Models/N3DS/TitleMetadata.cs b/SabreTools.Models/N3DS/TitleMetadata.cs
index ba67184..1cbeaab 100644
--- a/SabreTools.Models/N3DS/TitleMetadata.cs
+++ b/SabreTools.Models/N3DS/TitleMetadata.cs
@@ -136,13 +136,13 @@ namespace SabreTools.Models.N3DS
         /// <summary>
         /// There are 64 of these records, usually only the first is used.
         /// </summary>
-        public ContentInfoRecord?[]? ContentInfoRecords { get; set; }
+        public ContentInfoRecord[]? ContentInfoRecords { get; set; }
 
         /// <summary>
         /// There is one of these for each content contained in this title.
         /// (Determined by "Content Count" in the TMD Header).
         /// </summary>
-        public ContentChunkRecord?[]? ContentChunkRecords { get; set; }
+        public ContentChunkRecord[]? ContentChunkRecords { get; set; }
 
         /// <summary>
         /// Certificate chain
@@ -150,6 +150,6 @@ namespace SabreTools.Models.N3DS
         /// <remarks>
         /// https://www.3dbrew.org/wiki/Title_metadata#Certificate_Chain
         /// </remarks>
-        public Certificate?[]? CertificateChain { get; set; }
+        public Certificate[]? CertificateChain { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Models/NCF/File.cs b/SabreTools.Models/NCF/File.cs
index a517feb..3540075 100644
--- a/SabreTools.Models/NCF/File.cs
+++ b/SabreTools.Models/NCF/File.cs
@@ -21,7 +21,7 @@ namespace SabreTools.Models.NCF
         /// <summary>
         /// Directory entries data
         /// </summary>
-        public DirectoryEntry?[]? DirectoryEntries { get; set; }
+        public DirectoryEntry[]? DirectoryEntries { get; set; }
 
         /// <summary>
         /// Directory names data
@@ -31,22 +31,22 @@ namespace SabreTools.Models.NCF
         /// <summary>
         /// Directory info 1 entries data
         /// </summary>
-        public DirectoryInfo1Entry?[]? DirectoryInfo1Entries { get; set; }
+        public DirectoryInfo1Entry[]? DirectoryInfo1Entries { get; set; }
 
         /// <summary>
         /// Directory info 2 entries data
         /// </summary>
-        public DirectoryInfo2Entry?[]? DirectoryInfo2Entries { get; set; }
+        public DirectoryInfo2Entry[]? DirectoryInfo2Entries { get; set; }
 
         /// <summary>
         /// Directory copy entries data
         /// </summary>
-        public DirectoryCopyEntry?[]? DirectoryCopyEntries { get; set; }
+        public DirectoryCopyEntry[]? DirectoryCopyEntries { get; set; }
 
         /// <summary>
         /// Directory local entries data
         /// </summary>
-        public DirectoryLocalEntry?[]? DirectoryLocalEntries { get; set; }
+        public DirectoryLocalEntry[]? DirectoryLocalEntries { get; set; }
 
         /// <summary>
         /// Unknown header data
@@ -56,7 +56,7 @@ namespace SabreTools.Models.NCF
         /// <summary>
         /// Unknown entries data
         /// </summary>
-        public UnknownEntry?[]? UnknownEntries { get; set; }
+        public UnknownEntry[]? UnknownEntries { get; set; }
 
         /// <summary>
         /// Checksum header data
@@ -71,11 +71,11 @@ namespace SabreTools.Models.NCF
         /// <summary>
         /// Checksum map entries data
         /// </summary>
-        public ChecksumMapEntry?[]? ChecksumMapEntries { get; set; }
+        public ChecksumMapEntry[]? ChecksumMapEntries { get; set; }
 
         /// <summary>
         /// Checksum entries data
         /// </summary>
-        public ChecksumEntry?[]? ChecksumEntries { get; set; }
+        public ChecksumEntry[]? ChecksumEntries { get; set; }
     }
 }
diff --git a/SabreTools.Models/NewExecutable/PerSegmentData.cs b/SabreTools.Models/NewExecutable/PerSegmentData.cs
index 360c90e..1075618 100644
--- a/SabreTools.Models/NewExecutable/PerSegmentData.cs
+++ b/SabreTools.Models/NewExecutable/PerSegmentData.cs
@@ -18,6 +18,6 @@
         /// <summary>
         /// A table of relocation records follows.
         /// </summary>
-        public RelocationRecord?[]? RelocationRecords { get; set; }
+        public RelocationRecord[]? RelocationRecords { get; set; }
     }
 }
diff --git a/SabreTools.Models/NewExecutable/ResourceTable.cs b/SabreTools.Models/NewExecutable/ResourceTable.cs
index b2b6a34..fa15715 100644
--- a/SabreTools.Models/NewExecutable/ResourceTable.cs
+++ b/SabreTools.Models/NewExecutable/ResourceTable.cs
@@ -23,7 +23,7 @@ namespace SabreTools.Models.NewExecutable
         /// <summary>
         /// A table of resource type information blocks follows.
         /// </summary>
-        public ResourceTypeInformationEntry?[]? ResourceTypes { get; set; }
+        public ResourceTypeInformationEntry[]? ResourceTypes { get; set; }
 
         /// <summary>
         /// Resource type and name strings are stored at the end of the
diff --git a/SabreTools.Models/NewExecutable/ResourceTypeInformationEntry.cs b/SabreTools.Models/NewExecutable/ResourceTypeInformationEntry.cs
index 3c87f34..84e7fca 100644
--- a/SabreTools.Models/NewExecutable/ResourceTypeInformationEntry.cs
+++ b/SabreTools.Models/NewExecutable/ResourceTypeInformationEntry.cs
@@ -29,6 +29,6 @@
         /// <summary>
         /// A table of resources for this type follows.
         /// </summary>
-        public ResourceTypeResourceEntry?[]? Resources { get; set; }
+        public ResourceTypeResourceEntry[]? Resources { get; set; }
     }
 }
diff --git a/SabreTools.Models/Nitro/Cart.cs b/SabreTools.Models/Nitro/Cart.cs
index 651c493..78f39d1 100644
--- a/SabreTools.Models/Nitro/Cart.cs
+++ b/SabreTools.Models/Nitro/Cart.cs
@@ -28,6 +28,6 @@ namespace SabreTools.Models.Nitro
         /// <summary>
         /// File allocation table
         /// </summary>
-        public FileAllocationTableEntry?[]? FileAllocationTable { get; set; }
+        public FileAllocationTableEntry[]? FileAllocationTable { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Models/Nitro/NameTable.cs b/SabreTools.Models/Nitro/NameTable.cs
index 1109fe2..fbbdba7 100644
--- a/SabreTools.Models/Nitro/NameTable.cs
+++ b/SabreTools.Models/Nitro/NameTable.cs
@@ -15,11 +15,11 @@ namespace SabreTools.Models.Nitro
         /// <summary>
         /// Folder allocation table
         /// </summary>
-        public FolderAllocationTableEntry?[]? FolderAllocationTable { get; set; }
+        public FolderAllocationTableEntry[]? FolderAllocationTable { get; set; }
 
         /// <summary>
         /// Name list
         /// </summary>
-        public NameListEntry?[]? NameList { get; set; }
+        public NameListEntry[]? NameList { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Models/PAK/File.cs b/SabreTools.Models/PAK/File.cs
index aced1f0..0e78066 100644
--- a/SabreTools.Models/PAK/File.cs
+++ b/SabreTools.Models/PAK/File.cs
@@ -14,6 +14,6 @@ namespace SabreTools.Models.PAK
         /// <summary>
         /// Deserialized directory items data
         /// </summary>
-        public DirectoryItem?[]? DirectoryItems { get; set; }
+        public DirectoryItem[]? DirectoryItems { get; set; }
     }
 }
diff --git a/SabreTools.Models/PFF/Archive.cs b/SabreTools.Models/PFF/Archive.cs
index bf14abf..784abed 100644
--- a/SabreTools.Models/PFF/Archive.cs
+++ b/SabreTools.Models/PFF/Archive.cs
@@ -14,7 +14,7 @@ namespace SabreTools.Models.PFF
         /// <summary>
         /// Segments
         /// </summary>
-        public Segment?[]? Segments { get; set; }
+        public Segment[]? Segments { get; set; }
 
         /// <summary>
         /// Footer
diff --git a/SabreTools.Models/PIC/DiscInformation.cs b/SabreTools.Models/PIC/DiscInformation.cs
index ed1e848..607c88c 100644
--- a/SabreTools.Models/PIC/DiscInformation.cs
+++ b/SabreTools.Models/PIC/DiscInformation.cs
@@ -29,6 +29,6 @@
         /// <summary>
         /// Disc information and emergency brake units
         /// </summary>
-        public DiscInformationUnit?[]? Units { get; set; }
+        public DiscInformationUnit[]? Units { get; set; }
     }
 }
diff --git a/SabreTools.Models/PKZIP/Archive.cs b/SabreTools.Models/PKZIP/Archive.cs
index 69a4830..a42559b 100644
--- a/SabreTools.Models/PKZIP/Archive.cs
+++ b/SabreTools.Models/PKZIP/Archive.cs
@@ -17,7 +17,7 @@ namespace SabreTools.Models.PKZIP
         /// Encryption headers, may appear second in each group
         /// </summary>
         /// TODO: Determine the model for the encryption headers
-        public byte[]?[]? EncryptionHeaders { get; set; }
+        public byte[][]? EncryptionHeaders { get; set; }
 
         /// <summary>
         /// File data, appears after the encryption header
@@ -28,12 +28,12 @@ namespace SabreTools.Models.PKZIP
         /// <summary>
         /// Data descriptors, appears after the file data
         /// </summary>
-        public DataDescriptor?[]? DataDescriptors { get; set; }
+        public DataDescriptor[]? DataDescriptors { get; set; }
 
         /// <summary>
         /// ZIP64 Data descriptors, appears after the file data
         /// </summary>
-        public DataDescriptor64?[]? ZIP64DataDescriptors { get; set; }
+        public DataDescriptor64[]? ZIP64DataDescriptors { get; set; }
 
         #endregion
 
diff --git a/SabreTools.Models/PlayJ/AudioFile.cs b/SabreTools.Models/PlayJ/AudioFile.cs
index 8e0a94c..764accb 100644
--- a/SabreTools.Models/PlayJ/AudioFile.cs
+++ b/SabreTools.Models/PlayJ/AudioFile.cs
@@ -40,7 +40,7 @@ namespace SabreTools.Models.PlayJ
         /// <summary>
         /// Data files (V2 only)
         /// </summary>
-        public DataFile?[]? DataFiles { get; set; }
+        public DataFile[]? DataFiles { get; set; }
 
         // After the data files is a block starting with 0x00000001
         // This block then contains highly repeating data, possible audio samples?
diff --git a/SabreTools.Models/PlayJ/Playlist.cs b/SabreTools.Models/PlayJ/Playlist.cs
index 8d0a529..65a6b5e 100644
--- a/SabreTools.Models/PlayJ/Playlist.cs
+++ b/SabreTools.Models/PlayJ/Playlist.cs
@@ -13,6 +13,6 @@ namespace SabreTools.Models.PlayJ
         /// <summary>
         /// Embedded audio files / headers
         /// </summary>
-        public AudioFile?[]? AudioFiles { get; set; }
+        public AudioFile[]? AudioFiles { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SabreTools.Models/PortableExecutable/AssemblyManifest.cs b/SabreTools.Models/PortableExecutable/AssemblyManifest.cs
index 337bc7a..84fc3d8 100644
--- a/SabreTools.Models/PortableExecutable/AssemblyManifest.cs
+++ b/SabreTools.Models/PortableExecutable/AssemblyManifest.cs
@@ -12,10 +12,10 @@ namespace SabreTools.Models.PortableExecutable
         #region Group
 
         [XmlElement("assemblyIdentity")]
-        public AssemblyIdentity?[]? AssemblyIdentities { get; set; }
+        public AssemblyIdentity[]? AssemblyIdentities { get; set; }
 
         [XmlElement("noInheritable")]
-        public AssemblyNoInheritable?[]? NoInheritables { get; set; }
+        public AssemblyNoInheritable[]? NoInheritables { get; set; }
 
         #endregion
 
@@ -31,19 +31,19 @@ namespace SabreTools.Models.PortableExecutable
         //public AssemblyNoInheritable NoInheritable { get; set; }
 
         [XmlElement("comInterfaceExternalProxyStub")]
-        public AssemblyCOMInterfaceExternalProxyStub?[]? COMInterfaceExternalProxyStub { get; set; }
+        public AssemblyCOMInterfaceExternalProxyStub[]? COMInterfaceExternalProxyStub { get; set; }
 
         [XmlElement("dependency")]
-        public AssemblyDependency?[]? Dependency { get; set; }
+        public AssemblyDependency[]? Dependency { get; set; }
 
         [XmlElement("file")]
-        public AssemblyFile?[]? File { get; set; }
+        public AssemblyFile[]? File { get; set; }
 
         [XmlElement("clrClass")]
-        public AssemblyCommonLanguageRuntimeClass?[]? CLRClass { get; set; }
+        public AssemblyCommonLanguageRuntimeClass[]? CLRClass { get; set; }
 
         [XmlElement("clrSurrogate")]
-        public AssemblyCommonLanguageSurrogateClass?[]? CLRSurrogate { get; set; }
+        public AssemblyCommonLanguageSurrogateClass[]? CLRSurrogate { get; set; }
 
         #endregion
 
@@ -94,7 +94,7 @@ namespace SabreTools.Models.PortableExecutable
         public string? Description { get; set; }
 
         [XmlElement("progid")]
-        public AssemblyProgID?[]? ProgIDs { get; set; }
+        public AssemblyProgID[]? ProgIDs { get; set; }
     }
 
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/sbscs/manifest-file-schema"/>
@@ -166,7 +166,7 @@ namespace SabreTools.Models.PortableExecutable
         public string? ThreadingModel { get; set; }
 
         [XmlElement("progid")]
-        public AssemblyProgID?[]? ProgIDs { get; set; }
+        public AssemblyProgID[]? ProgIDs { get; set; }
     }
 
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/sbscs/manifest-file-schema"/>
@@ -199,7 +199,7 @@ namespace SabreTools.Models.PortableExecutable
         public AssemblyIdentity? AssemblyIdentity { get; set; }
 
         [XmlElement("bindingRedirect")]
-        public AssemblyBindingRedirect?[]? BindingRedirect { get; set; }
+        public AssemblyBindingRedirect[]? BindingRedirect { get; set; }
     }
 
     /// <see href="https://learn.microsoft.com/en-us/windows/win32/sbscs/manifest-file-schema"/>
@@ -255,16 +255,16 @@ namespace SabreTools.Models.PortableExecutable
         #region Group
 
         [XmlElement("comClass")]
-        public AssemblyCOMClass?[]? COMClass { get; set; }
+        public AssemblyCOMClass[]? COMClass { get; set; }
 
         [XmlElement("comInterfaceProxyStub")]
-        public AssemblyCOMInterfaceProxyStub?[]? COMInterfaceProxyStub { get; set; }
+        public AssemblyCOMInterfaceProxyStub[]? COMInterfaceProxyStub { get; set; }
 
         [XmlElement("typelib")]
-        public AssemblyTypeLib?[]? Typelib { get; set; }
+        public AssemblyTypeLib[]? Typelib { get; set; }
 
         [XmlElement("windowClass")]
-        public AssemblyWindowClass?[]? WindowClass { get; set; }
+        public AssemblyWindowClass[]? WindowClass { get; set; }
 
         #endregion
     }
diff --git a/SabreTools.Models/PortableExecutable/BaseRelocationBlock.cs b/SabreTools.Models/PortableExecutable/BaseRelocationBlock.cs
index 6fc7abe..91a037d 100644
--- a/SabreTools.Models/PortableExecutable/BaseRelocationBlock.cs
+++ b/SabreTools.Models/PortableExecutable/BaseRelocationBlock.cs
@@ -46,6 +46,6 @@
         ///                    in the Page RVA field for the block. This offset
         ///                    specifies where the base relocation is to be applied. 
         /// </summary>
-        public BaseRelocationTypeOffsetFieldEntry?[]? TypeOffsetFieldEntries { get; set; }
+        public BaseRelocationTypeOffsetFieldEntry[]? TypeOffsetFieldEntries { get; set; }
     }
 }
diff --git a/SabreTools.Models/PortableExecutable/DebugTable.cs b/SabreTools.Models/PortableExecutable/DebugTable.cs
index 709bca0..58f568c 100644
--- a/SabreTools.Models/PortableExecutable/DebugTable.cs
+++ b/SabreTools.Models/PortableExecutable/DebugTable.cs
@@ -33,6 +33,6 @@
         /// file and is not mapped into the run-time address space). If it is mapped,
         /// the RVA is its address.
         /// </summary>
-        public DebugDirectoryEntry?[]? DebugDirectoryTable { get; set; }
+        public DebugDirectoryEntry[]? DebugDirectoryTable { get; set; }
     }
 }
diff --git a/SabreTools.Models/PortableExecutable/DialogBoxResource.cs b/SabreTools.Models/PortableExecutable/DialogBoxResource.cs
index 6b0ddb4..e24b857 100644
--- a/SabreTools.Models/PortableExecutable/DialogBoxResource.cs
+++ b/SabreTools.Models/PortableExecutable/DialogBoxResource.cs
@@ -31,7 +31,7 @@
         /// box. The cdit member specifies the number of DLGITEMTEMPLATE structures in the template.
         /// These DLGITEMTEMPLATE structures must be aligned on DWORD boundaries.
         /// </summary>
-        public DialogItemTemplate?[]? DialogItemTemplates { get; set; }
+        public DialogItemTemplate[]? DialogItemTemplates { get; set; }
 
         /// <summary>
         /// Following the DLGTEMPLATEEX header in an extended dialog box template is one or more
@@ -39,7 +39,7 @@
         /// member of the DLGITEMTEMPLATEEX structure specifies the number of DLGITEMTEMPLATEEX
         /// structures that follow in the template.
         /// </summary>
-        public DialogItemTemplateExtended?[]? ExtendedDialogItemTemplates { get; set; }
+        public DialogItemTemplateExtended[]? ExtendedDialogItemTemplates { get; set; }
 
         #endregion
     }
diff --git a/SabreTools.Models/PortableExecutable/Executable.cs b/SabreTools.Models/PortableExecutable/Executable.cs
index e8d0290..4a4534a 100644
--- a/SabreTools.Models/PortableExecutable/Executable.cs
+++ b/SabreTools.Models/PortableExecutable/Executable.cs
@@ -40,12 +40,12 @@ namespace SabreTools.Models.PortableExecutable
         /// <summary>
         /// Section table
         /// </summary>
-        public SectionHeader?[]? SectionTable { get; set; }
+        public SectionHeader[]? SectionTable { get; set; }
 
         /// <summary>
         /// COFF symbol table
         /// </summary>
-        public COFFSymbolTableEntry?[]? COFFSymbolTable { get; set; }
+        public COFFSymbolTableEntry[]? COFFSymbolTable { get; set; }
 
         /// <summary>
         /// COFF string table
@@ -55,7 +55,7 @@ namespace SabreTools.Models.PortableExecutable
         /// <summary>
         /// Attribute certificate table
         /// </summary>
-        public AttributeCertificateTableEntry?[]? AttributeCertificateTable { get; set; }
+        public AttributeCertificateTableEntry[]? AttributeCertificateTable { get; set; }
 
         /// <summary>
         /// Delay-load directory table
@@ -71,7 +71,7 @@ namespace SabreTools.Models.PortableExecutable
         /// <summary>
         /// Base relocation table (.reloc)
         /// </summary>
-        public BaseRelocationBlock?[]? BaseRelocationTable { get; set; }
+        public BaseRelocationBlock[]? BaseRelocationTable { get; set; }
 
         /// <summary>
         /// Debug table (.debug*)
diff --git a/SabreTools.Models/PortableExecutable/ExportTable.cs b/SabreTools.Models/PortableExecutable/ExportTable.cs
index 3a2f1f6..da0df18 100644
--- a/SabreTools.Models/PortableExecutable/ExportTable.cs
+++ b/SabreTools.Models/PortableExecutable/ExportTable.cs
@@ -27,7 +27,7 @@
         /// can import a symbol by using an index to this table (an ordinal) or, optionally, by
         /// using the public name that corresponds to the ordinal if a public name is defined.
         /// </summary>
-        public ExportAddressTableEntry?[]? ExportAddressTable { get; set; }
+        public ExportAddressTableEntry[]? ExportAddressTable { get; set; }
 
         /// <summary>
         /// An array of pointers to the public export names, sorted in ascending order.
diff --git a/SabreTools.Models/PortableExecutable/FontGroupHeader.cs b/SabreTools.Models/PortableExecutable/FontGroupHeader.cs
index c6f8d9e..a3ec8f1 100644
--- a/SabreTools.Models/PortableExecutable/FontGroupHeader.cs
+++ b/SabreTools.Models/PortableExecutable/FontGroupHeader.cs
@@ -16,6 +16,6 @@
         /// A structure that contains a unique ordinal identifier for each font in the resource. The DE
         /// member is a placeholder for the variable-length array of DIRENTRY structures.
         /// </summary>
-        public DirEntry?[]? DE { get; set; }
+        public DirEntry[]? DE { get; set; }
     }
 }
diff --git a/SabreTools.Models/PortableExecutable/ImportTable.cs b/SabreTools.Models/PortableExecutable/ImportTable.cs
index e588c16..ebd31b7 100644
--- a/SabreTools.Models/PortableExecutable/ImportTable.cs
+++ b/SabreTools.Models/PortableExecutable/ImportTable.cs
@@ -23,23 +23,23 @@ namespace SabreTools.Models.PortableExecutable
         /// The import information begins with the import directory table, which describes the
         /// remainder of the import information. 
         /// </summary>
-        public ImportDirectoryTableEntry?[]? ImportDirectoryTable { get; set; }
+        public ImportDirectoryTableEntry[]? ImportDirectoryTable { get; set; }
 
         /// <summary>
         /// An import lookup table is an array of 32-bit numbers for PE32 or an array of 64-bit
         /// numbers for PE32+.
         /// </summary>
-        public Dictionary<int, ImportLookupTableEntry?[]?>? ImportLookupTables { get; set; }
+        public Dictionary<int, ImportLookupTableEntry[]?>? ImportLookupTables { get; set; }
 
         /// <summary>
         /// These addresses are the actual memory addresses of the symbols, although technically
         /// they are still called "virtual addresses".
         /// </summary>
-        public Dictionary<int, ImportAddressTableEntry?[]?>? ImportAddressTables { get; set; }
+        public Dictionary<int, ImportAddressTableEntry[]?>? ImportAddressTables { get; set; }
 
         /// <summary>
         /// One hint/name table suffices for the entire import section.
         /// </summary>
-        public HintNameTableEntry?[]? HintNameTable { get; set; }
+        public HintNameTableEntry[]? HintNameTable { get; set; }
     }
 }
diff --git a/SabreTools.Models/PortableExecutable/MenuResource.cs b/SabreTools.Models/PortableExecutable/MenuResource.cs
index 9412a83..4d6a1d6 100644
--- a/SabreTools.Models/PortableExecutable/MenuResource.cs
+++ b/SabreTools.Models/PortableExecutable/MenuResource.cs
@@ -17,6 +17,6 @@
         /// <summary>
         /// Menu items
         /// </summary>
-        public MenuItem?[]? MenuItems { get; set; }
+        public MenuItem[]? MenuItems { get; set; }
     }
 }
diff --git a/SabreTools.Models/PortableExecutable/MessageResourceData.cs b/SabreTools.Models/PortableExecutable/MessageResourceData.cs
index 32cbfef..749b00a 100644
--- a/SabreTools.Models/PortableExecutable/MessageResourceData.cs
+++ b/SabreTools.Models/PortableExecutable/MessageResourceData.cs
@@ -17,7 +17,7 @@ namespace SabreTools.Models.PortableExecutable
         /// <summary>
         /// An array of structures. The array is the size indicated by the NumberOfBlocks member.
         /// </summary>
-        public MessageResourceBlock?[]? Blocks { get; set; }
+        public MessageResourceBlock[]? Blocks { get; set; }
 
         /// <summary>
         /// Message resource entries
diff --git a/SabreTools.Models/PortableExecutable/ResourceDirectoryTable.cs b/SabreTools.Models/PortableExecutable/ResourceDirectoryTable.cs
index 994f77a..076e93a 100644
--- a/SabreTools.Models/PortableExecutable/ResourceDirectoryTable.cs
+++ b/SabreTools.Models/PortableExecutable/ResourceDirectoryTable.cs
@@ -54,6 +54,6 @@
         /// strings to identify Type, Name, or Language entries (depending on the
         /// level of the table).
         /// </summary>
-        public ResourceDirectoryEntry?[]? Entries { get; set; }
+        public ResourceDirectoryEntry[]? Entries { get; set; }
     }
 }
diff --git a/SabreTools.Models/PortableExecutable/SectionHeader.cs b/SabreTools.Models/PortableExecutable/SectionHeader.cs
index 6bc0c1a..59e9307 100644
--- a/SabreTools.Models/PortableExecutable/SectionHeader.cs
+++ b/SabreTools.Models/PortableExecutable/SectionHeader.cs
@@ -100,11 +100,11 @@
         /// <summary>
         /// COFF Relocations (Object Only)
         /// </summary>
-        public COFFRelocation?[]? COFFRelocations { get; set; }
+        public COFFRelocation[]? COFFRelocations { get; set; }
 
         /// <summary>
         /// COFF Line Numbers (Deprecated)
         /// </summary>
-        public COFFLineNumber?[]? COFFLineNumbers { get; set; }
+        public COFFLineNumber[]? COFFLineNumbers { get; set; }
     }
 }
diff --git a/SabreTools.Models/PortableExecutable/SecuROMAddD.cs b/SabreTools.Models/PortableExecutable/SecuROMAddD.cs
index 844aa6f..0e2150d 100644
--- a/SabreTools.Models/PortableExecutable/SecuROMAddD.cs
+++ b/SabreTools.Models/PortableExecutable/SecuROMAddD.cs
@@ -56,6 +56,6 @@ namespace SabreTools.Models.PortableExecutable
         /// <summary>
         /// Entry table
         /// </summary>
-        public SecuROMAddDEntry?[]? Entries { get; set; }
+        public SecuROMAddDEntry[]? Entries { get; set; }
     }
 }
diff --git a/SabreTools.Models/PortableExecutable/StringFileInfo.cs b/SabreTools.Models/PortableExecutable/StringFileInfo.cs
index 24cc3f9..89c2f06 100644
--- a/SabreTools.Models/PortableExecutable/StringFileInfo.cs
+++ b/SabreTools.Models/PortableExecutable/StringFileInfo.cs
@@ -38,6 +38,6 @@
         /// member indicates the appropriate language and code page for displaying the text in
         /// that StringTable structure.
         /// </summary>
-        public StringTable?[]? Children { get; set; }
+        public StringTable[]? Children { get; set; }
     }
 }
diff --git a/SabreTools.Models/PortableExecutable/StringTable.cs b/SabreTools.Models/PortableExecutable/StringTable.cs
index a22ac3b..9792bd5 100644
--- a/SabreTools.Models/PortableExecutable/StringTable.cs
+++ b/SabreTools.Models/PortableExecutable/StringTable.cs
@@ -41,6 +41,6 @@
         /// <summary>
         /// An array of one or more StringData structures.
         /// </summary>
-        public StringData?[]? Children { get; set; }
+        public StringData[]? Children { get; set; }
     }
 }
diff --git a/SabreTools.Models/PortableExecutable/VarFileInfo.cs b/SabreTools.Models/PortableExecutable/VarFileInfo.cs
index 9ee8387..799a8dd 100644
--- a/SabreTools.Models/PortableExecutable/VarFileInfo.cs
+++ b/SabreTools.Models/PortableExecutable/VarFileInfo.cs
@@ -36,6 +36,6 @@
         /// <summary>
         /// Typically contains a list of languages that the application or DLL supports.
         /// </summary>
-        public VarData?[]? Children { get; set; }
+        public VarData[]? Children { get; set; }
     }
 }
diff --git a/SabreTools.Models/Quantum/Archive.cs b/SabreTools.Models/Quantum/Archive.cs
index e624394..6279f61 100644
--- a/SabreTools.Models/Quantum/Archive.cs
+++ b/SabreTools.Models/Quantum/Archive.cs
@@ -14,7 +14,7 @@ namespace SabreTools.Models.Quantum
         /// <summary>
         /// This is immediately followed by the list of files
         /// </summary>
-        public FileDescriptor?[]? FileList { get; set; }
+        public FileDescriptor[]? FileList { get; set; }
 
         /// <summary>
         /// Immediately following the list of files is the compressed data
diff --git a/SabreTools.Models/SFFS/StarForceFileSystem.cs b/SabreTools.Models/SFFS/StarForceFileSystem.cs
index 26e7f0a..1c81258 100644
--- a/SabreTools.Models/SFFS/StarForceFileSystem.cs
+++ b/SabreTools.Models/SFFS/StarForceFileSystem.cs
@@ -23,11 +23,11 @@
         /// <summary>
         /// Files
         /// </summary>
-        public FileEntry?[]? Files { get; set; }
+        public FileEntry[]? Files { get; set; }
 
         /// <summary>
         /// File headers
         /// </summary>
-        public FileHeader?[]? FileHeaders { get; set; }
+        public FileHeader[]? FileHeaders { get; set; }
     }
 }
diff --git a/SabreTools.Models/SGA/SpecializedDirectory.cs b/SabreTools.Models/SGA/SpecializedDirectory.cs
index 328376c..353e122 100644
--- a/SabreTools.Models/SGA/SpecializedDirectory.cs
+++ b/SabreTools.Models/SGA/SpecializedDirectory.cs
@@ -26,17 +26,17 @@ namespace SabreTools.Models.SGA
         /// <summary>
         /// Sections data
         /// </summary>
-        public TSection?[]? Sections { get; set; }
+        public TSection[]? Sections { get; set; }
 
         /// <summary>
         /// Folders data
         /// </summary>
-        public TFolder?[]? Folders { get; set; }
+        public TFolder[]? Folders { get; set; }
 
         /// <summary>
         /// Files data
         /// </summary>
-        public TFile?[]? Files { get; set; }
+        public TFile[]? Files { get; set; }
 
         /// <summary>
         /// String table data
diff --git a/SabreTools.Models/VPK/File.cs b/SabreTools.Models/VPK/File.cs
index 9342301..8da4990 100644
--- a/SabreTools.Models/VPK/File.cs
+++ b/SabreTools.Models/VPK/File.cs
@@ -19,11 +19,11 @@ namespace SabreTools.Models.VPK
         /// <summary>
         /// Archive hashes data
         /// </summary>
-        public ArchiveHash?[]? ArchiveHashes { get; set; }
+        public ArchiveHash[]? ArchiveHashes { get; set; }
 
         /// <summary>
         /// Directory items data
         /// </summary>
-        public DirectoryItem?[]? DirectoryItems { get; set; }
+        public DirectoryItem[]? DirectoryItems { get; set; }
     }
 }
diff --git a/SabreTools.Models/WAD3/File.cs b/SabreTools.Models/WAD3/File.cs
index cd1923d..b91cf21 100644
--- a/SabreTools.Models/WAD3/File.cs
+++ b/SabreTools.Models/WAD3/File.cs
@@ -14,11 +14,11 @@ namespace SabreTools.Models.WAD3
         /// <summary>
         /// Deserialized dir entry data
         /// </summary>
-        public DirEntry?[]? DirEntries { get; set; }
+        public DirEntry[]? DirEntries { get; set; }
 
         /// <summary>
         /// Deserialized file entry data
         /// </summary>
-        public FileEntry?[]? FileEntries { get; set; }
+        public FileEntry[]? FileEntries { get; set; }
     }
 }
diff --git a/SabreTools.Models/XZP/File.cs b/SabreTools.Models/XZP/File.cs
index 2c4f49f..5256c40 100644
--- a/SabreTools.Models/XZP/File.cs
+++ b/SabreTools.Models/XZP/File.cs
@@ -14,22 +14,22 @@ namespace SabreTools.Models.XZP
         /// <summary>
         /// Directory entries data
         /// </summary>
-        public DirectoryEntry?[]? DirectoryEntries { get; set; }
+        public DirectoryEntry[]? DirectoryEntries { get; set; }
 
         /// <summary>
         /// Preload directory entries data
         /// </summary>
-        public DirectoryEntry?[]? PreloadDirectoryEntries { get; set; }
+        public DirectoryEntry[]? PreloadDirectoryEntries { get; set; }
 
         /// <summary>
         /// Preload directory mappings data
         /// </summary>
-        public DirectoryMapping?[]? PreloadDirectoryMappings { get; set; }
+        public DirectoryMapping[]? PreloadDirectoryMappings { get; set; }
 
         /// <summary>
         /// Directory items data
         /// </summary>
-        public DirectoryItem?[]? DirectoryItems { get; set; }
+        public DirectoryItem[]? DirectoryItems { get; set; }
 
         /// <summary>
         /// Footer data