diff --git a/BinaryObjectScanner/FileType/BFPK.cs b/BinaryObjectScanner/FileType/BFPK.cs
index fed0da92..372bf2a4 100644
--- a/BinaryObjectScanner/FileType/BFPK.cs
+++ b/BinaryObjectScanner/FileType/BFPK.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// BFPK custom archive format
     /// </summary>
-    public class BFPK : IExtractable
+    public class BFPK : IExtractable<SabreTools.Serialization.Wrappers.BFPK>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/BSP.cs b/BinaryObjectScanner/FileType/BSP.cs
index 3223f50d..b0d47cfc 100644
--- a/BinaryObjectScanner/FileType/BSP.cs
+++ b/BinaryObjectScanner/FileType/BSP.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// Half-Life Level
     /// </summary>
-    public class BSP : IExtractable
+    public class BSP : IExtractable<SabreTools.Serialization.Wrappers.BSP>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/BZip2.cs b/BinaryObjectScanner/FileType/BZip2.cs
index 60e058f2..be431739 100644
--- a/BinaryObjectScanner/FileType/BZip2.cs
+++ b/BinaryObjectScanner/FileType/BZip2.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// bzip2 archive
     /// </summary>
-    public class BZip2 : IExtractable
+    public class BZip2 : IExtractable<SabreTools.Serialization.Wrappers.BZip2>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/CFB.cs b/BinaryObjectScanner/FileType/CFB.cs
index ec47f880..b1c1b44d 100644
--- a/BinaryObjectScanner/FileType/CFB.cs
+++ b/BinaryObjectScanner/FileType/CFB.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// Compound File Binary
     /// </summary>
-    public class CFB : IExtractable
+    public class CFB : IExtractable<SabreTools.Serialization.Wrappers.CFB>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/GCF.cs b/BinaryObjectScanner/FileType/GCF.cs
index 103d55ce..cf9bcfd7 100644
--- a/BinaryObjectScanner/FileType/GCF.cs
+++ b/BinaryObjectScanner/FileType/GCF.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// Half-Life Game Cache File
     /// </summary>
-    public class GCF : IExtractable
+    public class GCF : IExtractable<SabreTools.Serialization.Wrappers.GCF>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/GZip.cs b/BinaryObjectScanner/FileType/GZip.cs
index febd2020..00041524 100644
--- a/BinaryObjectScanner/FileType/GZip.cs
+++ b/BinaryObjectScanner/FileType/GZip.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// gzip archive
     /// </summary>
-    public class GZip : IExtractable
+    public class GZip : IExtractable<SabreTools.Serialization.Wrappers.GZip>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs b/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs
index 126090b4..95db39b2 100644
--- a/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs
+++ b/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// InstallShield archive v3
     /// </summary>
-    public class InstallShieldArchiveV3 : IExtractable
+    public class InstallShieldArchiveV3 : IExtractable<SabreTools.Serialization.Wrappers.InstallShieldArchiveV3>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/InstallShieldCAB.cs b/BinaryObjectScanner/FileType/InstallShieldCAB.cs
index 419fde18..072c8732 100644
--- a/BinaryObjectScanner/FileType/InstallShieldCAB.cs
+++ b/BinaryObjectScanner/FileType/InstallShieldCAB.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// InstallShield cabinet file
     /// </summary>
-    public class InstallShieldCAB : IExtractable
+    public class InstallShieldCAB : IExtractable<SabreTools.Serialization.Wrappers.InstallShieldCabinet>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/LZKWAJ.cs b/BinaryObjectScanner/FileType/LZKWAJ.cs
index 4bf837fb..f8398c13 100644
--- a/BinaryObjectScanner/FileType/LZKWAJ.cs
+++ b/BinaryObjectScanner/FileType/LZKWAJ.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// LZ-compressed file, KWAJ variant
     /// </summary>
-    public class LZKWAJ : IExtractable
+    public class LZKWAJ : IExtractable<SabreTools.Serialization.Wrappers.LZKWAJ>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/LZQBasic.cs b/BinaryObjectScanner/FileType/LZQBasic.cs
index 59be9c32..b749edf0 100644
--- a/BinaryObjectScanner/FileType/LZQBasic.cs
+++ b/BinaryObjectScanner/FileType/LZQBasic.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// LZ-compressed file, QBasic variant
     /// </summary>
-    public class LZQBasic : IExtractable
+    public class LZQBasic : IExtractable<SabreTools.Serialization.Wrappers.LZQBasic>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/LZSZDD.cs b/BinaryObjectScanner/FileType/LZSZDD.cs
index 882a8fa5..70fd39cb 100644
--- a/BinaryObjectScanner/FileType/LZSZDD.cs
+++ b/BinaryObjectScanner/FileType/LZSZDD.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// LZ-compressed file, SZDD variant
     /// </summary>
-    public class LZSZDD : IExtractable
+    public class LZSZDD : IExtractable<SabreTools.Serialization.Wrappers.LZSZDD>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/MPQ.cs b/BinaryObjectScanner/FileType/MPQ.cs
index 08b43304..48c860a4 100644
--- a/BinaryObjectScanner/FileType/MPQ.cs
+++ b/BinaryObjectScanner/FileType/MPQ.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// MoPaQ game data archive
     /// </summary>
-    public class MPQ : IExtractable
+    public class MPQ : IExtractable<SabreTools.Serialization.Wrappers.MoPaQ>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/MicrosoftCAB.cs b/BinaryObjectScanner/FileType/MicrosoftCAB.cs
index 59babbf7..0e65fbe2 100644
--- a/BinaryObjectScanner/FileType/MicrosoftCAB.cs
+++ b/BinaryObjectScanner/FileType/MicrosoftCAB.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// Microsoft cabinet file
     /// </summary>
-    public class MicrosoftCAB : IExtractable
+    public class MicrosoftCAB : IExtractable<SabreTools.Serialization.Wrappers.MicrosoftCabinet>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/PAK.cs b/BinaryObjectScanner/FileType/PAK.cs
index 814320cb..86c80503 100644
--- a/BinaryObjectScanner/FileType/PAK.cs
+++ b/BinaryObjectScanner/FileType/PAK.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// Half-Life Package File
     /// </summary>
-    public class PAK : IExtractable
+    public class PAK : IExtractable<SabreTools.Serialization.Wrappers.PAK>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/PFF.cs b/BinaryObjectScanner/FileType/PFF.cs
index 759efb54..bf2e0e62 100644
--- a/BinaryObjectScanner/FileType/PFF.cs
+++ b/BinaryObjectScanner/FileType/PFF.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// NovaLogic Game Archive Format
     /// </summary>
-    public class PFF : IExtractable
+    public class PFF : IExtractable<SabreTools.Serialization.Wrappers.PFF>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/PKZIP.cs b/BinaryObjectScanner/FileType/PKZIP.cs
index fd7f2b9c..3fbccbb6 100644
--- a/BinaryObjectScanner/FileType/PKZIP.cs
+++ b/BinaryObjectScanner/FileType/PKZIP.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// PKWARE ZIP archive and derivatives
     /// </summary>
-    public class PKZIP : IExtractable
+    public class PKZIP : IExtractable<SabreTools.Serialization.Wrappers.PKZIP>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/Quantum.cs b/BinaryObjectScanner/FileType/Quantum.cs
index 0b898ffd..2638ca07 100644
--- a/BinaryObjectScanner/FileType/Quantum.cs
+++ b/BinaryObjectScanner/FileType/Quantum.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// Quantum Archive
     /// </summary>
-    public class Quantum : IExtractable
+    public class Quantum : IExtractable<SabreTools.Serialization.Wrappers.Quantum>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/RAR.cs b/BinaryObjectScanner/FileType/RAR.cs
index c7b9f767..eb6f3d77 100644
--- a/BinaryObjectScanner/FileType/RAR.cs
+++ b/BinaryObjectScanner/FileType/RAR.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// RAR archive
     /// </summary>
-    public class RAR : IExtractable
+    public class RAR : IExtractable<SabreTools.Serialization.Wrappers.RAR>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/SGA.cs b/BinaryObjectScanner/FileType/SGA.cs
index 1ceca005..dd4d34bd 100644
--- a/BinaryObjectScanner/FileType/SGA.cs
+++ b/BinaryObjectScanner/FileType/SGA.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// SGA game archive
     /// </summary>
-    public class SGA : IExtractable
+    public class SGA : IExtractable<SabreTools.Serialization.Wrappers.SGA>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/SevenZip.cs b/BinaryObjectScanner/FileType/SevenZip.cs
index b386ecd1..556c7aa1 100644
--- a/BinaryObjectScanner/FileType/SevenZip.cs
+++ b/BinaryObjectScanner/FileType/SevenZip.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// 7-zip archive
     /// </summary>
-    public class SevenZip : IExtractable
+    public class SevenZip : IExtractable<SabreTools.Serialization.Wrappers.SevenZip>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/TapeArchive.cs b/BinaryObjectScanner/FileType/TapeArchive.cs
index 2f918362..02f0be43 100644
--- a/BinaryObjectScanner/FileType/TapeArchive.cs
+++ b/BinaryObjectScanner/FileType/TapeArchive.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// Tape archive
     /// </summary>
-    public class TapeArchive : IExtractable
+    public class TapeArchive : IExtractable<SabreTools.Serialization.Wrappers.TapeArchive>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/VBSP.cs b/BinaryObjectScanner/FileType/VBSP.cs
index ae2eace1..32cd9829 100644
--- a/BinaryObjectScanner/FileType/VBSP.cs
+++ b/BinaryObjectScanner/FileType/VBSP.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// Half-Life 2 Level
     /// </summary>
-    public class VBSP : IExtractable
+    public class VBSP : IExtractable<SabreTools.Serialization.Wrappers.VBSP>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/VPK.cs b/BinaryObjectScanner/FileType/VPK.cs
index 32f27576..347d3659 100644
--- a/BinaryObjectScanner/FileType/VPK.cs
+++ b/BinaryObjectScanner/FileType/VPK.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// Valve Package File
     /// </summary>
-    public class VPK : IExtractable
+    public class VPK : IExtractable<SabreTools.Serialization.Wrappers.VPK>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/WAD3.cs b/BinaryObjectScanner/FileType/WAD3.cs
index e0932bc2..78f7fac9 100644
--- a/BinaryObjectScanner/FileType/WAD3.cs
+++ b/BinaryObjectScanner/FileType/WAD3.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// Half-Life Texture Package File
     /// </summary>
-    public class WAD3 : IExtractable
+    public class WAD3 : IExtractable<SabreTools.Serialization.Wrappers.WAD3>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/XZ.cs b/BinaryObjectScanner/FileType/XZ.cs
index 5f93f997..f05aa63a 100644
--- a/BinaryObjectScanner/FileType/XZ.cs
+++ b/BinaryObjectScanner/FileType/XZ.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// xz archive
     /// </summary>
-    public class XZ : IExtractable
+    public class XZ : IExtractable<SabreTools.Serialization.Wrappers.XZ>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/FileType/XZP.cs b/BinaryObjectScanner/FileType/XZP.cs
index 0eb49bfc..cf852ba9 100644
--- a/BinaryObjectScanner/FileType/XZP.cs
+++ b/BinaryObjectScanner/FileType/XZP.cs
@@ -6,7 +6,7 @@ namespace BinaryObjectScanner.FileType
     /// <summary>
     /// XBox Package File
     /// </summary>
-    public class XZP : IExtractable
+    public class XZP : IExtractable<SabreTools.Serialization.Wrappers.XZP>
     {
         /// <inheritdoc/>
         public bool Extract(string file, string outDir, bool includeDebug)
diff --git a/BinaryObjectScanner/Interfaces/IExtractableT.cs b/BinaryObjectScanner/Interfaces/IExtractableT.cs
new file mode 100644
index 00000000..ce3d29af
--- /dev/null
+++ b/BinaryObjectScanner/Interfaces/IExtractableT.cs
@@ -0,0 +1,9 @@
+using SabreTools.Serialization.Interfaces;
+
+namespace BinaryObjectScanner.Interfaces
+{
+    /// <summary>
+    /// Mark a file type as being able to be extracted
+    /// </summary>
+    public interface IExtractable<T> : IExtractable where T : IWrapper { }
+}